Commit 372813ac authored by Sam Hocevar's avatar Sam Hocevar

  * 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.
parent adff2a85
......@@ -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.
......
......@@ -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 \
......
......@@ -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)
......
###############################################################################
# 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
......@@ -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
......
......@@ -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
......
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.
......
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.
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 */
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment