* Merged Makefile.common and Makefile.modules.in into Makefile.modules

  * Updated version number and ChangeLog to 0.2.72
  * Additional plugin Makefile cleaning, probably the last.

diff --git a/ChangeLog b/ChangeLog
index a6ca0aea1dd5b05b0e18855c1b1dc69454e8e246..84e24ddec69848393e1032f4a90d483d1397f0b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,15 @@
 
 HEAD
 
+  * Nothing yet.
+
+0.2.72
+Mon, 16 Apr 2001 14:33:53 +0200
+
+  * New improved packet allocator.
   * Additional Makefile cleaning for built-in modules.
   * Fixed Makefile for Solaris target.
+  * Fixed the 0.2.71 IFO parsing bug.
   * All Debian packages are now lintian-clean.
   * Fixed XVideo plugin linking.
   * Updated TODO list.

diff --git a/Makefile b/Makefile
index 2b3eb1b7a9b26b6c33c93fe39bef0f91de7978ba..001852d2b5ca41e245f2efb7f1cc980d83acdc83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,8 @@ export
 all: vlc ${ALIASES} plugins vlc.app
 
 clean:
-       for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done
+       for dir in $(PLUGINS_DIR) ; do \
+               ( cd plugins/$${dir} && $(MAKE) clean ) ; done
        rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
        rm -f $(C_OBJ) $(CPP_OBJ)
        rm -f src/*/*.o extras/*/*.o
@@ -169,7 +170,7 @@ clean:
 
 distclean: clean
        rm -f **/*.o **/*~ *.log
-       rm -f Makefile.opts Makefile.modules
+       rm -f Makefile.opts
        rm -f include/defs.h include/config.h include/modules_builtin.h
        rm -f config.status config.cache config.log
        rm -f gmon.out core build-stamp
@@ -226,12 +227,12 @@ snapshot:
                done
        # copy misc files
        cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO todo.pl \
-               Makefile.opts.in Makefile.dep Makefile.modules.in \
+               Makefile.opts.in Makefile.dep Makefile.modules \
                configure configure.in install-sh config.sub config.guess \
                        /tmp/vlc-${PROGRAM_VERSION}/
        for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
-               changelog changelog-css rules rules-css vlc.dirs \
-               vlc.menu ; do \
+               changelog changelog-css rules rules-css vlc.dirs vlc.desktop \
+               gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
                        cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
                done
        for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \

diff --git a/Makefile.common b/Makefile.modules
similarity index 75%
rename from Makefile.common
rename to Makefile.modules
index f4a676129430d336908b61b5f8ccc588cc89cd17..31ac491e03bd5e1ffdf5217e4469a4bb222791ed 100644 (file)
--- a/Makefile.common
+++ b/Makefile.modules
@@ -5,6 +5,32 @@
 # This file should be included by all module Makefiles
 ###############################################################################
 
+#
+# C headers directories
+#
+CFLAGS := -I../../include -I../../extras $(CFLAGS)
+
+#
+# C compiler flags: plugin compilation
+#
+PCFLAGS += -fPIC
+
+#
+# C compiler flags: plugin linking
+#
+ifneq (,$(findstring darwin,$(SYS)))
+PLCFLAGS += -bundle -undefined suppress
+else
+ifeq ($(SYS),beos)
+PLCFLAGS += -nostart ../../lib/_APP_
+else
+PLCFLAGS += -shared
+endif
+endif
+
+# 
+# Standard dependencies
+#
 C_DEP := $(ALL_OBJ:%.o=.dep/%.d)
 
 CPP_DEP := $(ALL_OBJ:%.o=.dep/%.dpp)

diff --git a/Makefile.modules.in b/Makefile.modules.in
deleted file mode 100644 (file)
index 18b14b7..0000000
--- a/Makefile.modules.in
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# vlc (VideoLAN Client) plugins Makefile
-# (c)1998 VideoLAN
-###############################################################################
-
-#
-# C headers directories
-#
-CFLAGS += -I../../include -I../../extras
-
-#
-# C compiler flags: plugin compilation
-#
-PCFLAGS += -fPIC
-
-#
-# C compiler flags: plugin linking
-#
-ifneq (,$(findstring darwin,$(SYS)))
-PLCFLAGS += -bundle -undefined suppress
-else
-ifeq ($(SYS),beos)
-PLCFLAGS += -nostart ../../lib/_APP_
-else
-PLCFLAGS += -shared
-endif
-endif
-

diff --git a/configure b/configure
index be0cd4be75ebf0f021f8f87e1748321c3ab4d014..497f96303334170af5eee18bb7a2ab28b7e67ce2 100755 (executable)
--- a/configure
+++ b/configure
@@ -620,7 +620,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 
-VLC_VERSION=0.2.71
+VLC_VERSION=0.2.72
 
 VLC_CODENAME=Ourumov
 
@@ -3847,7 +3847,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile.opts Makefile.modules include/config.h include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile.opts include/config.h include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3963,7 +3963,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile.opts Makefile.modules include/config.h"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile.opts include/config.h"}
 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 d4fc31d1beeae3e9af021037f6ab158e4ec02389..83ac587e1e232ebe54825e77456048bac0164373 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.71
+VLC_VERSION=0.2.72
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
@@ -443,7 +443,7 @@ AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
 
-AC_OUTPUT([Makefile.opts Makefile.modules include/config.h])
+AC_OUTPUT([Makefile.opts include/config.h])
 
 echo "
 vlc configuration

diff --git a/debian/changelog b/debian/changelog
index 80e06560681ebd78f149529eff0162c35eeb462d..1c4b07e86ae7fb3926ba9a24685fe34cca8ea22d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (0.2.72-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Mon, 16 Apr 2001 14:33:53 +0200
+
 vlc (0.2.71-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/changelog-css b/debian/changelog-css
index a09238a1a341686eaca87c7b190819b748b5e021..07f15df12fd1f290837d646a82e3ade74a6cb5dd 100644 (file)
--- a/debian/changelog-css
+++ b/debian/changelog-css
@@ -1,3 +1,9 @@
+vlc-css (0.2.72-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Mon, 16 Apr 2001 14:33:53 +0200
+
 vlc-css (0.2.71-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/plugins/alsa/Makefile b/plugins/alsa/Makefile
index b0fe0ebf1ecbbfe274946745766b506b41dfae2c..b2336abe23f0a5b34cf4f25d9ebf6ad232f2fdee 100644 (file)
--- a/plugins/alsa/Makefile
+++ b/plugins/alsa/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/beos/Makefile b/plugins/beos/Makefile
index b20c2506f2114c7ffe82ef6ab14d01471526518a..e185457bf5f496f6a23370793a3d77135b46b5ab 100644 (file)
--- a/plugins/beos/Makefile
+++ b/plugins/beos/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_CPP) $(BUILTIN_CPP)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/darwin/Makefile b/plugins/darwin/Makefile
index 8683cd2d661c36dd8ff87dbf1af21523f9c83105..5c13ba2a73b80247a375b6f53c120d34c0ae951f 100644 (file)
--- a/plugins/darwin/Makefile
+++ b/plugins/darwin/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/dsp/Makefile b/plugins/dsp/Makefile
index 051162d2ba7028f47bd853b70d40072631285cd8..a5218f76f60f16217f4a12980bc6c2cbf52ed96e 100644 (file)
--- a/plugins/dsp/Makefile
+++ b/plugins/dsp/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/dummy/Makefile b/plugins/dummy/Makefile
index 6494fb6655442d355871c73789b22e2e7081e22b..b99127d1cb9cd3de687c62d262dcbbb9c5253454 100644 (file)
--- a/plugins/dummy/Makefile
+++ b/plugins/dummy/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/dvd/Makefile b/plugins/dvd/Makefile
index 6b912649a4eec265085bfb169ea0f22f8066739f..b16686d391f4cf855c6d068a6750f7af37d5e546 100644 (file)
--- a/plugins/dvd/Makefile
+++ b/plugins/dvd/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 4b784852d51e99e3fa4a3cedb46a8e98f4f8e1f8..cae22c04d41cf01298ee229d59695686cc96007b 100644 (file)
--- a/plugins/dvd/dvd.c
+++ b/plugins/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: dvd.c,v 1.7 2001/04/15 04:19:57 sam Exp $
+ * $Id: dvd.c,v 1.8 2001/04/16 13:00:54 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -117,3 +117,23 @@ MODULE_DEACTIVATE
     return( 0 );
 }
 
+#ifdef HAVE_CSS
+#else /* HAVE_CSS */
+#ifdef BUILTIN
+int module_dvd_InitModule( module_t *p_module )
+{
+    module_dvdnocss_InitModule( p_module );
+}
+
+int module_dvd_ActivateModule( module_t *p_module )
+{
+    module_dvdnocss_ActivateModule( p_module );
+}
+
+int module_dvd_DeactivateModule( module_t *p_module )
+{
+    module_dvdnocss_DeactivateModule( p_module );
+}
+#endif /* BUILTIN */
+#endif /* HAVE_CSS */
+

diff --git a/plugins/esd/Makefile b/plugins/esd/Makefile
index fd09eee1c4bf414dbf7bc5e9ccfcb4a664dcdbe4..35861f0d683a095510b2240234709e963f3549e9 100644 (file)
--- a/plugins/esd/Makefile
+++ b/plugins/esd/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/fb/Makefile b/plugins/fb/Makefile
index 85546a665133b58b7c905df6dfdf61f3bf9dae6d..d10037f5fd8255b0e3cb1805e8f0f2d49dbb3465 100644 (file)
--- a/plugins/fb/Makefile
+++ b/plugins/fb/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/ggi/Makefile b/plugins/ggi/Makefile
index 410aacc0e614f2a928868e91f8f5b2eb21c149c5..40f12b442cba154ac02c9024a853e0f10b9a5398 100644 (file)
--- a/plugins/ggi/Makefile
+++ b/plugins/ggi/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/glide/Makefile b/plugins/glide/Makefile
index 5bd8ce1b64e4c8591dd5d9055fd0f65305528514..ed4a5e4c6eb6f0855805dc09da9b27fa404b1778 100644 (file)
--- a/plugins/glide/Makefile
+++ b/plugins/glide/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_GLIDE) $(BUILTIN_GLIDE)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_GLIDE): %.o: .dep/%.d
 $(PLUGIN_GLIDE): %.o: %.c

diff --git a/plugins/gnome/Makefile b/plugins/gnome/Makefile
index e0f5e930f56c5f2f3c5e8363e7dce3a1c726b118..39789da6eab6c258029abeed29304eac93977c6f 100644 (file)
--- a/plugins/gnome/Makefile
+++ b/plugins/gnome/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_GNOME) $(BUILTIN_GNOME)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_GNOME): %.o: .dep/%.d
 $(PLUGIN_GNOME): %.o: %.c

diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile
index 64cc30334e2a23b3f3e339a5de0d11cb41d608b0..c256b8211486649b37a699ba0982c5b21ae167c7 100644 (file)
--- a/plugins/gtk/Makefile
+++ b/plugins/gtk/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_GTK) $(BUILTIN_GTK)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_GTK): %.o: .dep/%.d
 $(PLUGIN_GTK): %.o: %.c

diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile
index 1aa9a885ecae5b1a889c1ae8629af2460110c56a..c4f091b94e49748944054bc78d388689970a2e99 100644 (file)
--- a/plugins/idct/Makefile
+++ b/plugins/idct/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -34,7 +32,7 @@ ALL_OBJ = $(PLUGIN_C) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSI
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d
 $(PLUGIN_IDCTALTIVEC): %.o: %.c

diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile
index 8dac0a013e39c42fb7f3e2c8c0cc823d9bf77bb5..2f048f6c456dc83f293644894ff7252946ec97ea 100644 (file)
--- a/plugins/macosx/Makefile
+++ b/plugins/macosx/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_MACOSX): %.o: .dep/%.d
 $(PLUGIN_MACOSX): %.o: %.c

diff --git a/plugins/mga/Makefile b/plugins/mga/Makefile
index ada6efcb464ea78331be37152fd0d50f4f9045f2..3d48c2fb7ce22a425388558ff7c6413c0b615c52 100644 (file)
--- a/plugins/mga/Makefile
+++ b/plugins/mga/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/motion/Makefile b/plugins/motion/Makefile
index 033d20ad54523fd97b987c2b81a7a0a1d3c25b0a..a5b25942b6cfc13f5eb447968d33a9c9239478bb 100644 (file)
--- a/plugins/motion/Makefile
+++ b/plugins/motion/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -28,7 +26,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMX
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(BUILTIN_MOTION): BUILTIN_MOTION_%.o: .dep/%.d
 $(BUILTIN_MOTION): BUILTIN_MOTION_%.o: %.c

diff --git a/plugins/mpeg/Makefile b/plugins/mpeg/Makefile
index 67df6bd33be1b2390fff8115eb837a4ab806f817..fb5b71a1cdf799383c4d079db009f274ef3b2d43 100644 (file)
--- a/plugins/mpeg/Makefile
+++ b/plugins/mpeg/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -22,7 +20,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/null/Makefile b/plugins/null/Makefile
index 6985c222a62653ecaea63a71a794d78114dabfa1..19f5c1a0ecffa89bf2cf2e23b1ee26e6f0ed15bd 100644 (file)
--- a/plugins/null/Makefile
+++ b/plugins/null/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile
index 691f0582725c560e097f1799b3d5354c56afd1bf..2b51fa6bed9eb9d71d53c26725c31ca6bfc54ae3 100644 (file)
--- a/plugins/qt/Makefile
+++ b/plugins/qt/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_QT) $(BUILTIN_QT)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 $(PLUGIN_QT): %.o: .dep/%.dpp
 $(PLUGIN_QT): %.o: %.moc

diff --git a/plugins/sdl/Makefile b/plugins/sdl/Makefile
index d4511fb07b8a70f969314d906b5dbbe7d5c853a1..183bacb3da58980c205afa5678503d6a847d16e5 100644 (file)
--- a/plugins/sdl/Makefile
+++ b/plugins/sdl/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/text/Makefile b/plugins/text/Makefile
index 2639f007f84d46b3c87a5f9cfb5a36e07e9ba3c9..06a844eed0c4960a866a5e8097a27f2fa6da1c90 100644 (file)
--- a/plugins/text/Makefile
+++ b/plugins/text/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -18,7 +16,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/x11/Makefile b/plugins/x11/Makefile
index 3d01c3995c30ad2c7c16e0fb8059f20a48db210e..801f2a52bb0808e57f8d011ed09f435ef6e8f602 100644 (file)
--- a/plugins/x11/Makefile
+++ b/plugins/x11/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -23,7 +21,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/plugins/yuv/Makefile b/plugins/yuv/Makefile
index 40a0b92e116b66bded565ac7beef7987e15494aa..2c92da815a538773d997404eb53e47bcc60fb5ed 100644 (file)
--- a/plugins/yuv/Makefile
+++ b/plugins/yuv/Makefile
@@ -3,8 +3,6 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
--include ../../Makefile.modules
-
 #
 # Objects
 #
@@ -23,7 +21,7 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
 # Virtual targets
 #
 
-include ../../Makefile.common
+include ../../Makefile.modules
 
 #
 # Real targets

diff --git a/vlc.spec b/vlc.spec
index a50a5c13b745d63dd0efaa1a455a848ec6a1ff31..cb4b73aaffa0827338c36fc242d583d1adaa8faf 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,16 +1,19 @@
 Name: vlc
-Version: 0.2.71
+Version: 0.2.72
 Release: 1
 Copyright: GPL
 Url: http://www.videolan.org/
 Group: X11/Applications/Graphics
-Source0: http://www.videolan.org/packages/0.2.71/vlc-0.2.71.tar.gz
+Source0: http://www.videolan.org/packages/0.2.72/vlc-0.2.72.tar.gz
 Packager: Samuel Hocevar <sam@zoy.org>
 
 Buildroot: /tmp/vlc-build
 Summary: VideoLAN Client.
 
 %changelog
+* Mon Apr 16 2001 Samuel Hocevar <sam@zoy.org>
+New upstream release (0.2.72)
+
 * Fri Apr 13 2001 Samuel Hocevar <sam@zoy.org>
 New upstream release (0.2.71)