cosmetics: config.h is now modified only by configure. make now calls configure if...

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

diff --git a/Makefile b/Makefile
index 54de91ea95eb0069b93331bd538ba834f66838b3..93edb791cc94016ae6a75564c4585648897dbbfc 100644 (file)
--- 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 7b7e9c4f5504e786c20382ed87f2e3f3e577d4dc..f1d09f69aa813a855428fe2abb31e309b32de85c 100755 (executable)
--- 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