GTK: compilation fixes

git-svn-id: svn://svn.videolan.org/x264/trunk@483 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index 5a3e459591e940eb61995fbe942e82e1bbd9dc1a..15b7ef1fd0728e5a661aabff4531216c749f75cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -129,9 +129,10 @@ clean:
        rm -rf vfw/build/cygwin/bin
        rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
        - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
+       make -C gtk clean
 
 distclean: clean
-       rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
+       rm -f config.mak config.h vfw/build/cygwin/config.mak gtk/config.mak x264.pc
 
 install: x264 $(SONAME)
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)

diff --git a/configure b/configure
index 419981625bed817ac0f295d0b8f331610cc8ed4b..8096273fe80c9517246c736b4dd3ae598a254ef5 100755 (executable)
--- a/configure
+++ b/configure
@@ -357,6 +357,8 @@ DEVNULL=$DEVNULL
 CONFIGURE_ARGS=$@
 EOF
 
+cp config.mak gtk/config.mak
+
 if [ "$vfw" = "yes" ]; then
     rm -f vfw/build/cygwin/config.mak
     cat > vfw/build/cygwin/config.mak << EOF

diff --git a/gtk/Makefile b/gtk/Makefile
index 678479d922a1a57b6ab088f26ee769be292222e6..1452114bf396995216968de628db39c149b30af3 100644 (file)
--- a/gtk/Makefile
+++ b/gtk/Makefile
@@ -1,5 +1,5 @@
 
-include ../config.mak
+include config.mak
 
 OBJECTS = x264_gtk_bitrate.o x264_gtk_rc.o x264_gtk_mb.o x264_gtk_more.o x264_gtk.o