From: Loren Merritt <pengvado@videolan.org>
Date: Sun, 26 Mar 2006 01:09:09 +0000 (+0000)
Subject: GTK: compilation fixes
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e510c09889d83c5d7e85eca83036af36f1284b87;p=libx264

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 5a3e4595..15b7ef1f 100644
--- 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 41998162..8096273f 100755
--- 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 678479d9..1452114b 100644
--- 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