* ./Makefile.opts.in: removed configuration stuff which does not need to

    rebuild anything to Makefile.config, so that editing it will not cause
    a complete rebuild.

diff --git a/Makefile b/Makefile
index b0b8b1580425f97f6183a3241b2768afd7841bc3..39ee05cd2e3af8f6f4142102ebe85ed93560db15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 ###############################################################################
 
 ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
+    include Makefile.config
     include Makefile.opts
 endif
 
@@ -366,7 +367,7 @@ dist:
        # Copy misc files
        cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
                ABOUT-NLS BUGS MODULES vlc.spec \
-               Makefile Makefile.opts.in Makefile.dep Makefile.modules \
+               Makefile Makefile.*.in Makefile.dep Makefile.modules \
                configure configure.in install-sh install-win32 macosx-dmg \
                config.sub config.guess aclocal.m4 mkinstalldirs \
                        tmp/vlc/

diff --git a/Makefile.config.in b/Makefile.config.in
new file mode 100644 (file)
index 0000000..9fdf24c
--- /dev/null
+++ b/Makefile.config.in
@@ -0,0 +1,19 @@
+###############################################################################
+# vlc (VideoLAN Client) options Makefile
+# (c)1998 VideoLAN
+###############################################################################
+
+# 
+# Plugins to build
+# WARNING: if you do not have a dynamic loader on your platform, remove
+# the plugins in this line and put them as built-ins, otherwise your
+# application won't be able to load them.
+# 
+PLUGINS :=@PLUGINS@
+
+# 
+# Built-in modules to build
+# WARNING: do NOT put gtk and gnome together in this rule.
+# 
+BUILTINS :=@BUILTINS@
+

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 4598d2797ebc4bfaa066c3bb7e19b63147f86f4d..ae224ba379b36deefed603149c29ebabdab20e7c 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -10,21 +10,7 @@ HAVE_MAKEFILE_OPTS = 1
 ###############################################################################
 
 # 
-# Plugins to build
-# WARNING: if you do not have a dynamic loader on your platform, remove
-# the plugins in this line and put them as built-ins, otherwise your
-# application won't be able to load them.
-# 
-PLUGINS :=@PLUGINS@
-
-# 
-# Built-in modules to build
-# WARNING: do NOT put gtk and gnome together in this rule.
-# 
-BUILTINS :=@BUILTINS@
-
-# 
-# Additional build options
+# Build options
 # 
 SYS = @SYS@
 ALIASES =@ALIASES@

diff --git a/configure b/configure
index 701c3ddf17b6116e3d4b73e79b8899a427679e0a..b923a88403a71b6282b88679f5cae14fc8d852bc 100755 (executable)
--- a/configure
+++ b/configure
@@ -8702,7 +8702,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile.opts po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile.config Makefile.opts po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -8917,7 +8917,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile.opts po/Makefile.in"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile.config Makefile.opts po/Makefile.in"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index 13a7244172c66f0a5426ebf0ad74b1c148ccc4c5..2cf038b270ee6015513f7580ff5deb95cedf360e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1717,7 +1717,7 @@ AC_SUBST(waveout_LDFLAGS)
 AC_SUBST(x11_LDFLAGS)
 AC_SUBST(xvideo_LDFLAGS)
 
-AC_OUTPUT([Makefile.opts po/Makefile.in])
+AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in])
 
 echo "
 vlc configuration