From: Loren Merritt <pengvado@videolan.org>
Date: Mon, 5 Dec 2005 12:38:46 +0000 (+0000)
Subject: cosmetics: config.h is now modified only by configure. make now calls configure if... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ce628fa0413b7d87e87619a65a9e1cabe5cd5be;p=libx264

cosmetics: config.h is now modified only by configure. make now calls configure if you haven't.



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

diff --git a/Makefile b/Makefile
index 54de91ea..93edb791 100644
--- a/Makefile
+++ b/Makefile
@@ -79,13 +79,13 @@ common/amd64/*.o: common/amd64/amd64inc.asm
 %.o: %.asm
 	$(AS) $(ASFLAGS) -o $@ $<
 
-.depend: config.mak config.h
+.depend: config.mak
 	rm -f .depend
 # Hacky - because gcc 2.9x doesn't have -MT
 	$(foreach SRC, $(SRCS) x264.c matroska.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
 
-config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
-	./version.sh
+config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
+	./configure $(CONFIGURE_ARGS)
 
 depend: .depend
 ifneq ($(wildcard .depend),)
diff --git a/configure b/configure
index 7b7e9c4f..f1d09f69 100755
--- a/configure
+++ b/configure
@@ -262,6 +262,7 @@ EXE=$EXE
 VIS=$vis
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
 DEVNULL=$DEVNULL
+CONFIGURE_ARGS=$@
 EOF
 
 if [ "$vfw" = "yes" ]; then