From 6116299e395a1d8a27c1a7280749a0a7d59d0d66 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 16 Apr 2001 07:40:11 +0000 Subject: [PATCH] * Added .cvsignore files in the plugins directories. * Additional Makefile cleaning for built-in modules. * Fixed Makefile for Solaris target. --- .cvsignore | 12 ++++--- ChangeLog | 2 ++ INSTALL | 25 ++++++++----- Makefile | 73 +++++++++++++++++-------------------- Makefile.common | 50 ++++++++++++++++++++++++++ Makefile.dep | 4 +-- Makefile.opts.in | 4 +-- include/.cvsignore | 1 + plugins/alsa/.cvsignore | 1 + plugins/alsa/Makefile | 46 ++++++------------------ plugins/beos/.cvsignore | 1 + plugins/beos/Makefile | 46 ++++++------------------ plugins/darwin/.cvsignore | 1 + plugins/darwin/Makefile | 46 ++++++------------------ plugins/dsp/.cvsignore | 1 + plugins/dsp/Makefile | 46 ++++++------------------ plugins/dummy/.cvsignore | 1 + plugins/dummy/Makefile | 46 ++++++------------------ plugins/dvd/.cvsignore | 1 + plugins/dvd/Makefile | 44 ++++++----------------- plugins/esd/.cvsignore | 1 + plugins/esd/Makefile | 46 ++++++------------------ plugins/fb/.cvsignore | 1 + plugins/fb/Makefile | 46 ++++++------------------ plugins/ggi/.cvsignore | 1 + plugins/ggi/Makefile | 46 ++++++------------------ plugins/glide/.cvsignore | 1 + plugins/glide/Makefile | 34 ++++++------------ plugins/gnome/.cvsignore | 1 + plugins/gnome/Makefile | 34 ++++++------------ plugins/gtk/.cvsignore | 1 + plugins/gtk/Makefile | 34 ++++++------------ plugins/idct/.cvsignore | 1 + plugins/idct/Makefile | 76 +++++++++++++++------------------------ plugins/macosx/.cvsignore | 1 + plugins/macosx/Makefile | 34 ++++++------------ plugins/mga/.cvsignore | 1 + plugins/mga/Makefile | 46 ++++++------------------ plugins/motion/.cvsignore | 1 + plugins/motion/Makefile | 60 +++++++++++-------------------- plugins/mpeg/.cvsignore | 1 + plugins/mpeg/Makefile | 46 +++++++----------------- plugins/null/.cvsignore | 1 + plugins/null/Makefile | 46 ++++++------------------ plugins/qt/.cvsignore | 1 + plugins/qt/Makefile | 36 ++++++------------- plugins/qt/intf_qt.cpp | 4 +-- plugins/sdl/.cvsignore | 1 + plugins/sdl/Makefile | 44 ++++++----------------- plugins/text/.cvsignore | 1 + plugins/text/Makefile | 44 ++++++----------------- plugins/x11/.cvsignore | 1 + plugins/x11/Makefile | 46 +++++++----------------- plugins/yuv/.cvsignore | 1 + plugins/yuv/Makefile | 46 +++++++----------------- src/misc/modules.c | 4 +-- 56 files changed, 419 insertions(+), 821 deletions(-) create mode 100644 Makefile.common create mode 100644 plugins/alsa/.cvsignore create mode 100644 plugins/beos/.cvsignore create mode 100644 plugins/darwin/.cvsignore create mode 100644 plugins/dsp/.cvsignore create mode 100644 plugins/dummy/.cvsignore create mode 100644 plugins/dvd/.cvsignore create mode 100644 plugins/esd/.cvsignore create mode 100644 plugins/fb/.cvsignore create mode 100644 plugins/ggi/.cvsignore create mode 100644 plugins/glide/.cvsignore create mode 100644 plugins/idct/.cvsignore create mode 100644 plugins/macosx/.cvsignore create mode 100644 plugins/mga/.cvsignore create mode 100644 plugins/motion/.cvsignore create mode 100644 plugins/mpeg/.cvsignore create mode 100644 plugins/null/.cvsignore create mode 100644 plugins/sdl/.cvsignore create mode 100644 plugins/text/.cvsignore create mode 100644 plugins/x11/.cvsignore create mode 100644 plugins/yuv/.cvsignore diff --git a/.cvsignore b/.cvsignore index b60650dca3..f720b989f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,15 +1,17 @@ .* -*.ts core -dep +.dep gmon.out -vlc vlc-debug.log vlc-debug.ct config.log config.cache config.status -Makefile +Makefile.opts +Makefile.modules build-stamp +vlc gvlc -fbvlc +qvlc +kvlc +gnome-vlc diff --git a/ChangeLog b/ChangeLog index 8870e0c580..a6ca0aea1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ HEAD + * Additional Makefile cleaning for built-in modules. + * Fixed Makefile for Solaris target. * All Debian packages are now lintian-clean. * Fixed XVideo plugin linking. * Updated TODO list. diff --git a/INSTALL b/INSTALL index 12ba1d0c59..ce399befc0 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ INSTALL file for vlc, the VideoLAN Client -Building VideoLAN -================= +Configuring VideoLAN +==================== A typical way to configure vlc is: @@ -10,21 +10,28 @@ A typical way to configure vlc is: See `./configure --help' for more information. -Then, run `make' to build vlc. - Here is a shortcut to copy-paste for a complete build: - make distclean 2>/dev/null ; ./configure --prefix=/usr --enable-gnome \ + make distclean && ./configure --prefix=/usr --enable-gnome \ --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \ - --enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo \ - && make + --enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo If you intend to debug stuff, you may want to disable optimizations: - make distclean 2>/dev/null ; ./configure --prefix=/usr --enable-gnome \ + make distclean && ./configure --prefix=/usr --enable-gnome \ --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \ --enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo \ - --disable-optimizatons && make + --disable-optimizatons + + +Building VideoLAN +================= + +Have a look at the generated Makefile.opts file, you may want to choose +which modules will be compiled as plugins, and which ones will remain in +the core application. The configure script tries to guess for you. + +Once configured, run `make' to build vlc. Installing and running VideoLAN diff --git a/Makefile b/Makefile index 75e1a2b50b..2b3eb1b7a9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN ############################################################################### -include Makefile.opts +-include Makefile.opts ############################################################################### # Objects and files @@ -30,12 +30,6 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \ mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \ text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx -# -# Translate plugin names -# -PLUGINS_OBJ := $(shell for i in : $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.so@ ; s@^ .*@@' ; done) -BUILTINS_OBJ := $(shell for i in : $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.a@ ; s@^ .*@@' ; done) - # # C Objects # @@ -144,10 +138,14 @@ H_OBJ = include/modules_builtin.h # # Other lists of files # -objects := $(C_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) -cppobjects := $(CPP_OBJ) -cppdependancies := $(cppobjects:%.o=.dep/%.dpp) +C_DEP := $(C_OBJ:%.o=.dep/%.d) +CPP_DEP := $(CPP_OBJ:%.o=.dep/%.dpp) + +# +# Translate plugin names +# +PLUGIN_OBJ := $(shell for i in : $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.so@' -e 's@^ .*@@' ; done) +BUILTIN_OBJ := $(shell for i in : $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.a@' -e 's@^ .*@@' ; done) # All symbols must be exported export @@ -161,15 +159,6 @@ export # all: vlc ${ALIASES} plugins vlc.app -Makefile.opts: - @echo - @echo "Sorry, you need to run ./configure before using this makefile." - @echo "To make clean or make distclean, use this:" - @echo - @echo " touch Makefile.opts Makefile.modules && make distclean" - @echo - @exit 1 - clean: for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak @@ -208,8 +197,8 @@ show: @echo CPP_OBJ: $(CPP_OBJ) @echo objects: $(objects) @echo cppobjects: $(cppobjects) - @echo PLUGINS_OBJ: $(PLUGINS_OBJ) - @echo BUILTINS_OBJ: $(BUILTINS_OBJ) + @echo PLUGIN_OBJ: $(PLUGIN_OBJ) + @echo BUILTIN_OBJ: $(BUILTIN_OBJ) # ugliest of all, but I have no time to do it -- sam @@ -221,10 +210,12 @@ snapshot: done find debian -mindepth 1 -maxdepth 1 -type d | \ while read i ; do rm -Rf /tmp/vlc-${PROGRAM_VERSION}/$$i ; done - # .c .h .in .cpp - find include src plugins -type f -name '*.[chi]*' | while read i ; \ - do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; \ - done + # .c .h .in .cpp .glade + find include src plugins -type f -name '*.[chig]*' | while read i ; \ + do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done + # Makefiles + find . plugins -type f -name Makefile | while read i ; \ + do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done # extra files cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc @@ -235,7 +226,7 @@ snapshot: done # copy misc files cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO todo.pl \ - Makefile Makefile.opts.in Makefile.dep Makefile.modules \ + Makefile.opts.in Makefile.dep Makefile.modules.in \ 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 \ @@ -243,7 +234,7 @@ snapshot: vlc.menu ; do \ cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \ done - for file in default8x16.psf default8x9.psf vlc_beos.rsrc ; do \ + for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \ cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; done for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \ cp share/$$icon.xpm share/$$icon.png \ @@ -287,13 +278,13 @@ gnome-vlc gvlc kvlc qvlc: vlc # # Generic rules (see below) # -$(cdependancies): %.d: FORCE +$(C_DEP): %.d: FORCE @$(MAKE) -s --no-print-directory -f Makefile.dep $@ -$(cppdependancies): %.dpp: FORCE +$(CPP_DEP): %.dpp: FORCE @$(MAKE) -s --no-print-directory -f Makefile.dep $@ -$(H_OBJ): Makefile.opts Makefile +$(H_OBJ): Makefile.opts Makefile.dep Makefile rm -f $@ && cp $@.in $@ for i in $(BUILTINS) ; do \ echo "int module_"$$i"_InitModule (module_t *);" >> $@ ; \ @@ -307,7 +298,7 @@ $(H_OBJ): Makefile.opts Makefile done echo "};" >> $@ ; -$(C_OBJ): %.o: Makefile.dep +$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile $(C_OBJ): %.o: .dep/%.d $(C_OBJ): %.o: %.c ifneq (,$(findstring darwin,$(SYS))) @@ -317,7 +308,7 @@ else $(CC) $(CFLAGS) -c -o $@ $< endif -$(CPP_OBJ): %.o: Makefile.dep +$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile $(CPP_OBJ): %.o: .dep/%.dpp $(CPP_OBJ): %.o: %.cpp $(CC) $(CFLAGS) -c -o $@ $< @@ -325,8 +316,8 @@ $(CPP_OBJ): %.o: %.cpp # # Main application target # -vlc: $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTINS_OBJ) - $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTINS_OBJ) $(LCFLAGS) +vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) + $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) ifeq ($(SYS),beos) rm -f ./lib/_APP_ ln -s ../vlc ./lib/_APP_ @@ -337,14 +328,14 @@ endif # # Plugins target # -plugins: $(PLUGINS_OBJ) -$(PLUGINS_OBJ): FORCE - cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%) +plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ) +$(PLUGIN_OBJ): FORCE + cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%) # # Built-in modules target # -builtins: $(BUILTINS_OBJ) -$(BUILTINS_OBJ): FORCE - cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%) +builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ) +$(BUILTIN_OBJ): FORCE + cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%) diff --git a/Makefile.common b/Makefile.common new file mode 100644 index 0000000000..f4a6761294 --- /dev/null +++ b/Makefile.common @@ -0,0 +1,50 @@ +############################################################################### +# vlc (VideoLAN Client) common module Makefile +# (c)2001 VideoLAN +############################################################################### +# This file should be included by all module Makefiles +############################################################################### + +C_DEP := $(ALL_OBJ:%.o=.dep/%.d) + +CPP_DEP := $(ALL_OBJ:%.o=.dep/%.dpp) + +export + +# +# Virtual targets +# +all: + +clean: + rm -f $(ALL_OBJ) + rm -f *.o *.moc *.bak *.builtin + rm -rf .dep + +FORCE: + +$(ALL_OBJ): %.o: ../../Makefile.modules ../../Makefile.dep Makefile + +$(C_DEP): %.d: FORCE + @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ + +$(CPP_DEP): %.dpp: FORCE + @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ + +$(PLUGIN_C): %.o: .dep/%.d +$(PLUGIN_C): %.o: %.c + $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< + +$(BUILTIN_C): BUILTIN_%.o: .dep/%.d +$(BUILTIN_C): BUILTIN_%.o: %.c + $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< + +$(PLUGIN_CPP): %.o: .dep/%.dpp +$(PLUGIN_CPP): %.o: %.cpp + $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< + +$(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp +$(BUILTIN_CPP): BUILTIN_%.o: %.cpp + $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< + + diff --git a/Makefile.dep b/Makefile.dep index a85b526f65..dc71d67b2e 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -45,7 +45,7 @@ default: -include $(MAKECMDGOALS) -$(cdependancies): .dep/%.d: %.c +$(C_DEP): .dep/%.d: %.c @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*) #@echo "generating dependancies for $*.c" @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ @@ -53,7 +53,7 @@ $(cdependancies): .dep/%.d: %.c .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' -$(cppdependancies): .dep/%.dpp: %.cpp +$(CPP_DEP): .dep/%.dpp: %.cpp @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*) #@echo "generating dependancies for $*.c" @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ diff --git a/Makefile.opts.in b/Makefile.opts.in index 7121e6db94..e1ee21e0ae 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -89,7 +89,7 @@ PROGRAM_VERSION=@VLC_VERSION@ # DEFINE will contain some of the constants definitions decided in Makefile, # including SYS_xx. It will be passed to C compiler. -DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr '[a-z].' '[A-Z]_') +DEFINE += -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_') # On Linux activate 64-bit off_t (by default under BSD) ifneq (,$(findstring linux,$(SYS))) @@ -115,7 +115,7 @@ LIB += @LIB@ -L/usr/local/lib # # Libraries needed by built-in modules # -LIB += $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed 's/.*/$$LIB_&/' ; done) +LIB += $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed -e 's/.*/$$LIB_&/' ; done) # # C compiler flags: mainstream compilation diff --git a/include/.cvsignore b/include/.cvsignore index 61df1b0a58..48384be16f 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -1,2 +1,3 @@ config.h defs.h +modules_builtin.h diff --git a/plugins/alsa/.cvsignore b/plugins/alsa/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/alsa/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/alsa/Makefile b/plugins/alsa/Makefile index 7f0381dc5c..b0fe0ebf1e 100644 --- a/plugins/alsa/Makefile +++ b/plugins/alsa/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_ALSA = alsa.o aout_alsa.o -BUILTIN_ALSA = $(PLUGIN_ALSA:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_ALSA) -STD_BUILTIN_OBJ = $(BUILTIN_ALSA) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = alsa.o aout_alsa.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/alsa.so: $(PLUGIN_ALSA) + +../../lib/alsa.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -../../lib/alsa.a: $(BUILTIN_ALSA) +../../lib/alsa.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/beos/.cvsignore b/plugins/beos/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/beos/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/beos/Makefile b/plugins/beos/Makefile index 5d44d66bd1..b20c2506f2 100644 --- a/plugins/beos/Makefile +++ b/plugins/beos/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_BEOS = beos.o aout_beos.o vout_beos.o intf_beos.o DrawingTidbits.o TransportButton.o -BUILTIN_BEOS = $(PLUGIN_BEOS:%.o=%-BUILTIN.o) - -NONSTD_CPP_PLUGIN_OBJ = $(PLUGIN_BEOS) -NONSTD_CPP_BUILTIN_OBJ = $(BUILTIN_BEOS) -ALL_OBJ = $(NONSTD_CPP_PLUGIN_OBJ) $(NONSTD_CPP_BUILTIN_OBJ) +# +# Objects +# -cppobjects := $(NONSTD_CPP_PLUGIN_OBJ) $(NONSTD_CPP_BUILTIN_OBJ) -cppdependancies := $(cppobjects:%.o=.dep/%.dpp) +PLUGIN_CPP = beos.o aout_beos.o vout_beos.o intf_beos.o DrawingTidbits.o TransportButton.o +BUILTIN_CPP = $(PLUGIN_CPP:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_CPP) $(BUILTIN_CPP) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cppdependancies): %.dpp: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(PLUGIN_BEOS): %.o: .dep/%.dpp -$(PLUGIN_BEOS): %.o: %.cpp - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(BUILTIN_BEOS): %-BUILTIN.o: .dep/%.dpp -$(BUILTIN_BEOS): %-BUILTIN.o: %.cpp - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/beos.so: $(PLUGIN_BEOS) + +../../lib/beos.so: $(PLUGIN_CPP) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS) -../../lib/beos.a: $(BUILTIN_BEOS) +../../lib/beos.a: $(BUILTIN_CPP) ar r $@ $^ diff --git a/plugins/darwin/.cvsignore b/plugins/darwin/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/darwin/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/darwin/Makefile b/plugins/darwin/Makefile index 3138261262..8683cd2d66 100644 --- a/plugins/darwin/Makefile +++ b/plugins/darwin/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_DARWIN = darwin.o -BUILTIN_DARWIN = $(PLUGIN_DARWIN:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_DARWIN) -STD_BUILTIN_OBJ = $(BUILTIN_DARWIN) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = darwin.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/darwin.so: $(PLUGIN_DARWIN) + +../../lib/darwin.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DARWIN) -../../lib/darwin.a: $(BUILTIN_DARWIN) +../../lib/darwin.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/dsp/.cvsignore b/plugins/dsp/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/dsp/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/dsp/Makefile b/plugins/dsp/Makefile index 127080ddbd..051162d2ba 100644 --- a/plugins/dsp/Makefile +++ b/plugins/dsp/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_DSP = dsp.o aout_dsp.o -BUILTIN_DSP = $(PLUGIN_DSP:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_DSP) -STD_BUILTIN_OBJ = $(BUILTIN_DSP) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = dsp.o aout_dsp.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/dsp.so: $(PLUGIN_DSP) + +../../lib/dsp.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/dsp.a: $(BUILTIN_DSP) +../../lib/dsp.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/dummy/.cvsignore b/plugins/dummy/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/dummy/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/dummy/Makefile b/plugins/dummy/Makefile index dd949e4f6d..6494fb6655 100644 --- a/plugins/dummy/Makefile +++ b/plugins/dummy/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_DUMMY = dummy.o aout_dummy.o vout_dummy.o intf_dummy.o -BUILTIN_DUMMY = $(PLUGIN_DUMMY:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_DUMMY) -STD_BUILTIN_OBJ = $(BUILTIN_DUMMY) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = dummy.o aout_dummy.o vout_dummy.o intf_dummy.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/dummy.so: $(PLUGIN_DUMMY) + +../../lib/dummy.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/dummy.a: $(BUILTIN_DUMMY) +../../lib/dummy.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/dvd/.cvsignore b/plugins/dvd/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/dvd/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/dvd/Makefile b/plugins/dvd/Makefile index 36a579082c..6b912649a4 100644 --- a/plugins/dvd/Makefile +++ b/plugins/dvd/Makefile @@ -3,52 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_DVD = dvd.o input_dvd.o dvd_netlist.o dvd_ioctl.o dvd_ifo.o dvd_udf.o dvd_css.o -BUILTIN_DVD = $(PLUGIN_DVD:%.o=%-BUILTIN.o) - -ALL_OBJ = $(PLUGIN_DVD) $(BUILTIN_DVD) +# +# Objects +# -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = dvd.o input_dvd.o dvd_netlist.o dvd_ioctl.o dvd_ifo.o dvd_udf.o dvd_css.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(PLUGIN_DVD): %.o: .dep/%.d -$(PLUGIN_DVD): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(BUILTIN_DVD): %-BUILTIN.o: .dep/%.d -$(BUILTIN_DVD): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/dvd.so: $(PLUGIN_DVD) + +../../lib/dvd.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/dvd.a: $(BUILTIN_DVD) +../../lib/dvd.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/esd/.cvsignore b/plugins/esd/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/esd/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/esd/Makefile b/plugins/esd/Makefile index b5a296f50b..fd09eee1c4 100644 --- a/plugins/esd/Makefile +++ b/plugins/esd/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_ESD = esd.o aout_esd.o -BUILTIN_ESD = $(PLUGIN_ESD:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_ESD) -STD_BUILTIN_OBJ = $(BUILTIN_ESD) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = esd.o aout_esd.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/esd.so: $(PLUGIN_ESD) + +../../lib/esd.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD) -../../lib/esd.a: $(BUILTIN_ESD) +../../lib/esd.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/fb/.cvsignore b/plugins/fb/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/fb/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/fb/Makefile b/plugins/fb/Makefile index b0924c4702..85546a6651 100644 --- a/plugins/fb/Makefile +++ b/plugins/fb/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_FB = fb.o vout_fb.o -BUILTIN_FB = $(PLUGIN_FB:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_FB) -STD_BUILTIN_OBJ = $(BUILTIN_FB) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = fb.o vout_fb.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/fb.so: $(PLUGIN_FB) + +../../lib/fb.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/fb.a: $(BUILTIN_FB) +../../lib/fb.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/ggi/.cvsignore b/plugins/ggi/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/ggi/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/ggi/Makefile b/plugins/ggi/Makefile index 4bd483489c..410aacc0e6 100644 --- a/plugins/ggi/Makefile +++ b/plugins/ggi/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_GGI = ggi.o vout_ggi.o -BUILTIN_GGI = $(PLUGIN_GGI:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_GGI) -STD_BUILTIN_OBJ = $(BUILTIN_GGI) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = ggi.o vout_ggi.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/ggi.so: $(PLUGIN_GGI) + +../../lib/ggi.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI) -../../lib/ggi.a: $(BUILTIN_GGI) +../../lib/ggi.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/glide/.cvsignore b/plugins/glide/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/glide/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/glide/Makefile b/plugins/glide/Makefile index 03a40df3e1..5bd8ce1b64 100644 --- a/plugins/glide/Makefile +++ b/plugins/glide/Makefile @@ -3,49 +3,35 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_GLIDE = glide.o vout_glide.o -BUILTIN_GLIDE = $(PLUGIN_GLIDE:%.o=%-BUILTIN.o) +BUILTIN_GLIDE = $(PLUGIN_GLIDE:%.o=BUILTIN_%.o) ALL_OBJ = $(PLUGIN_GLIDE) $(BUILTIN_GLIDE) -objects := $(PLUGIN_GLIDE) $(BUILTIN_GLIDE) -cdependancies := $(objects:%.o=.dep/%.d) - -export - # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile +include ../../Makefile.common $(PLUGIN_GLIDE): %.o: .dep/%.d $(PLUGIN_GLIDE): %.o: %.c $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $< -$(BUILTIN_GLIDE): %-BUILTIN.o: .dep/%.d -$(BUILTIN_GLIDE): %-BUILTIN.o: %.c +$(BUILTIN_GLIDE): BUILTIN_%.o: .dep/%.d +$(BUILTIN_GLIDE): BUILTIN_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/glide -c -o $@ $< # # Real targets # + ../../lib/glide.so: $(PLUGIN_GLIDE) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE) diff --git a/plugins/gnome/.cvsignore b/plugins/gnome/.cvsignore index 751553b3ac..d2fd3ef4e2 100644 --- a/plugins/gnome/.cvsignore +++ b/plugins/gnome/.cvsignore @@ -1 +1,2 @@ *.bak +.dep diff --git a/plugins/gnome/Makefile b/plugins/gnome/Makefile index a31ee08137..e0f5e930f5 100644 --- a/plugins/gnome/Makefile +++ b/plugins/gnome/Makefile @@ -3,49 +3,35 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_GNOME = gnome.o intf_gnome.o gnome_callbacks.o gnome_interface.o gnome_support.o -BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=%-BUILTIN.o) +BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=BUILTIN_%.o) ALL_OBJ = $(PLUGIN_GNOME) $(BUILTIN_GNOME) -objects := $(PLUGIN_GNOME) $(BUILTIN_GNOME) -cdependancies := $(objects:%.o=.dep/%.d) - -export - # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile +include ../../Makefile.common $(PLUGIN_GNOME): %.o: .dep/%.d $(PLUGIN_GNOME): %.o: %.c $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gtk gnomeui` -c -o $@ $< -$(BUILTIN_GNOME): %-BUILTIN.o: .dep/%.d -$(BUILTIN_GNOME): %-BUILTIN.o: %.c +$(BUILTIN_GNOME): BUILTIN_%.o: .dep/%.d +$(BUILTIN_GNOME): BUILTIN_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN `gnome-config --cflags gtk gnomeui` -c -o $@ $< # # Real targets # + ../../lib/gnome.so: $(PLUGIN_GNOME) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME) diff --git a/plugins/gtk/.cvsignore b/plugins/gtk/.cvsignore index 751553b3ac..d2fd3ef4e2 100644 --- a/plugins/gtk/.cvsignore +++ b/plugins/gtk/.cvsignore @@ -1 +1,2 @@ *.bak +.dep diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile index b42fe81905..64cc30334e 100644 --- a/plugins/gtk/Makefile +++ b/plugins/gtk/Makefile @@ -3,49 +3,35 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_GTK = gtk.o intf_gtk.o gtk_callbacks.o gtk_interface.o gtk_support.o gtk_playlist.o -BUILTIN_GTK = $(PLUGIN_GTK:%.o=%-BUILTIN.o) +BUILTIN_GTK = $(PLUGIN_GTK:%.o=BUILTIN_%.o) ALL_OBJ = $(PLUGIN_GTK) $(BUILTIN_GTK) -objects := $(PLUGIN_GTK) $(BUILTIN_GTK) -cdependancies := $(objects:%.o=.dep/%.d) - -export - # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile +include ../../Makefile.common $(PLUGIN_GTK): %.o: .dep/%.d $(PLUGIN_GTK): %.o: %.c $(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $< -$(BUILTIN_GTK): %-BUILTIN.o: .dep/%.d -$(BUILTIN_GTK): %-BUILTIN.o: %.c +$(BUILTIN_GTK): BUILTIN_%.o: .dep/%.d +$(BUILTIN_GTK): BUILTIN_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN `gtk-config --cflags gtk` -c -o $@ $< # # Real targets # + ../../lib/gtk.so: $(PLUGIN_GTK) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK) diff --git a/plugins/idct/.cvsignore b/plugins/idct/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/idct/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/idct/Makefile b/plugins/idct/Makefile index fdd5bf05e2..1aa9a885ec 100644 --- a/plugins/idct/Makefile +++ b/plugins/idct/Makefile @@ -3,11 +3,12 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_IDCT = idct.o PLUGIN_IDCTCLASSIC = idctclassic.o PLUGIN_IDCTMMX = idctmmx.o @@ -15,73 +16,54 @@ PLUGIN_IDCTMMXEXT = idctmmxext.o PLUGIN_IDCTALTIVEC = idctaltivec.o PLUGIN_IDCTCOMMON = idct_common.o -BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=%-BUILTIN-IDCT.o) \ - $(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCT.o) -BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=%-BUILTIN-IDCTCLASSIC.o) \ - $(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTCLASSIC.o) -BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=%-BUILTIN-IDCTMMX.o) \ - $(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMX.o) -BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=%-BUILTIN-IDCTMMXEXT.o) \ - $(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMXEXT.o) -BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=%-BUILTIN-IDCTALTIVEC.o) \ - $(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTALTIVEC.o) - -STD_PLUGIN_OBJ = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSIC) $(BUILTIN_IDCTMMX) $(BUILTIN_IDCTMMXEXT) $(BUILTIN_IDCTALTIVEC) +BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=BUILTIN_IDCT_%.o) \ + $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCT_%.o) +BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=BUILTIN_IDCTCLASSIC_%.o) \ + $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTCLASSIC_%.o) +BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=BUILTIN_IDCTMMX_%.o) \ + $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMX_%.o) +BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=BUILTIN_IDCTMMXEXT_%.o) \ + $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMXEXT_%.o) +BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=BUILTIN_IDCTALTIVEC_%.o) \ + $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTALTIVEC_%.o) -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) - -export +PLUGIN_C = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) +ALL_OBJ = $(PLUGIN_C) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSIC) $(BUILTIN_IDCTMMX) $(BUILTIN_IDCTMMXEXT) $(BUILTIN_IDCTALTIVEC) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< +include ../../Makefile.common $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d $(PLUGIN_IDCTALTIVEC): %.o: %.c $(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $< -$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: .dep/%.d -$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: %.c +$(BUILTIN_IDCT): BUILTIN_IDCT_%.o: .dep/%.d +$(BUILTIN_IDCT): BUILTIN_IDCT_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idct -c -o $@ $< -$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: .dep/%.d -$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: %.c +$(BUILTIN_IDCTCLASSIC): BUILTIN_IDCTCLASSIC_%.o: .dep/%.d +$(BUILTIN_IDCTCLASSIC): BUILTIN_IDCTCLASSIC_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctclassic -c -o $@ $< -$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: .dep/%.d -$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: %.c +$(BUILTIN_IDCTMMX): BUILTIN_IDCTMMX_%.o: .dep/%.d +$(BUILTIN_IDCTMMX): BUILTIN_IDCTMMX_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmx -c -o $@ $< -$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: .dep/%.d -$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: %.c +$(BUILTIN_IDCTMMXEXT): BUILTIN_IDCTMMXEXT_%.o: .dep/%.d +$(BUILTIN_IDCTMMXEXT): BUILTIN_IDCTMMXEXT_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmxext -c -o $@ $< -$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: .dep/%.d -$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: %.c +$(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: .dep/%.d +$(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $< # # Real targets # + ../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) diff --git a/plugins/macosx/.cvsignore b/plugins/macosx/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/macosx/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile index f3b84be194..8dac0a013e 100644 --- a/plugins/macosx/Makefile +++ b/plugins/macosx/Makefile @@ -3,49 +3,35 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_MACOSX = macosx.o intf_macosx.o aout_macosx.o vout_macosx.o -BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=%-BUILTIN.o) +BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_%.o) ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX) -objects := $(PLUGIN_MACOSX) $(BUILTIN_MACOSX) -cdependancies := $(objects:%.o=.dep/%.d) - -export - # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile +include ../../Makefile.common $(PLUGIN_MACOSX): %.o: .dep/%.d $(PLUGIN_MACOSX): %.o: %.c $(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $< -$(BUILTIN_MACOSX): %-BUILTIN.o: .dep/%.d -$(BUILTIN_MACOSX): %-BUILTIN.o: %.c +$(BUILTIN_MACOSX): BUILTIN_%.o: .dep/%.d +$(BUILTIN_MACOSX): BUILTIN_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $< # # Real targets # + ../../lib/macosx.so: $(PLUGIN_MACOSX) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) diff --git a/plugins/mga/.cvsignore b/plugins/mga/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/mga/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/mga/Makefile b/plugins/mga/Makefile index 802ef93678..ada6efcb46 100644 --- a/plugins/mga/Makefile +++ b/plugins/mga/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_MGA = mga.o vout_mga.o -BUILTIN_MGA = $(PLUGIN_MGA:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_MGA) -STD_BUILTIN_OBJ = $(BUILTIN_MGA) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = mga.o vout_mga.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/mga.so: $(PLUGIN_MGA) + +../../lib/mga.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/mga.a: $(BUILTIN_MGA) +../../lib/mga.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/motion/.cvsignore b/plugins/motion/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/motion/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/motion/Makefile b/plugins/motion/Makefile index e1663d6aa5..033d20ad54 100644 --- a/plugins/motion/Makefile +++ b/plugins/motion/Makefile @@ -3,67 +3,49 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_MOTION = motion.o vdec_motion_inner.o PLUGIN_MOTIONMMX = motionmmx.o vdec_motion_inner_mmx.o PLUGIN_MOTIONMMXEXT = motionmmxext.o vdec_motion_inner_mmxext.o PLUGIN_MOTIONCOMMON = vdec_motion_common.o -BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=%-BUILTIN-MOTION.o) \ - $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTION.o) -BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=%-BUILTIN-MOTIONMMX.o) \ - $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMX.o) -BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=%-BUILTIN-MOTIONMMXEXT.o) \ - $(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMXEXT.o) - -STD_PLUGIN_OBJ = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT) +BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=BUILTIN_MOTION_%.o) \ + $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTION_%.o) +BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=BUILTIN_MOTIONMMX_%.o) \ + $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTIONMMX_%.o) +BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=BUILTIN_MOTIONMMXEXT_%.o) \ + $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTIONMMXEXT_%.o) -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) - -export +PLUGIN_C = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON) +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ +include ../../Makefile.common -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: .dep/%.d -$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: %.c +$(BUILTIN_MOTION): BUILTIN_MOTION_%.o: .dep/%.d +$(BUILTIN_MOTION): BUILTIN_MOTION_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motion -c -o $@ $< -$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: .dep/%.d -$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: %.c +$(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: .dep/%.d +$(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmx -c -o $@ $< -$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: .dep/%.d -$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: %.c +$(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: .dep/%.d +$(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: %.c $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmxext -c -o $@ $< # # Real targets # + ../../lib/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) diff --git a/plugins/mpeg/.cvsignore b/plugins/mpeg/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/mpeg/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/mpeg/Makefile b/plugins/mpeg/Makefile index fa9cb083c3..67df6bd33b 100644 --- a/plugins/mpeg/Makefile +++ b/plugins/mpeg/Makefile @@ -3,53 +3,31 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_PS = ps.o input_ps.o PLUGIN_TS = ts.o input_ts.o -BUILTIN_PS = $(PLUGIN_PS:%.o=%-BUILTIN.o) -BUILTIN_TS = $(PLUGIN_TS:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_PS) $(PLUGIN_TS) -STD_BUILTIN_OBJ = $(BUILTIN_PS) $(BUILTIN_TS) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) - -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +BUILTIN_PS = $(PLUGIN_PS:%.o=BUILTIN_%.o) +BUILTIN_TS = $(PLUGIN_TS:%.o=BUILTIN_%.o) -export +PLUGIN_C = $(PLUGIN_PS) $(PLUGIN_TS) +BUILTIN_C = $(BUILTIN_PS) $(BUILTIN_TS) +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # + ../../lib/ps.so: $(PLUGIN_PS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) diff --git a/plugins/null/.cvsignore b/plugins/null/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/null/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/null/Makefile b/plugins/null/Makefile index e816e3bc4b..6985c222a6 100644 --- a/plugins/null/Makefile +++ b/plugins/null/Makefile @@ -3,54 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_NULL = null.o -BUILTIN_NULL = $(PLUGIN_NULL:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_NULL) -STD_BUILTIN_OBJ = $(BUILTIN_NULL) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +# +# Objects +# -objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = null.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/null.so: $(PLUGIN_NULL) + +../../lib/null.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -../../lib/null.a: $(BUILTIN_NULL) +../../lib/null.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/qt/.cvsignore b/plugins/qt/.cvsignore index e978b1085b..6f900ee7e3 100644 --- a/plugins/qt/.cvsignore +++ b/plugins/qt/.cvsignore @@ -1 +1,2 @@ *.moc +.dep diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile index 3912bbcde2..691f058272 100644 --- a/plugins/qt/Makefile +++ b/plugins/qt/Makefile @@ -3,37 +3,22 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_QT = qt.o intf_qt.o -BUILTIN_QT = $(PLUGIN_QT:%.o=%-BUILTIN.o) +BUILTIN_QT = $(PLUGIN_QT:%.o=BUILTIN_%.o) ALL_OBJ = $(PLUGIN_QT) $(BUILTIN_QT) -cppobjects := $(ALL_OBJ) -cppdependancies := $(cppobjects:%.o=.dep/%.dpp) - -export - # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: -$(cppdependancies): %.dpp: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile +include ../../Makefile.common $(PLUGIN_QT): %.o: .dep/%.dpp $(PLUGIN_QT): %.o: %.moc @@ -41,15 +26,16 @@ $(PLUGIN_QT): %.o: %.moc $(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp moc -i $< -o $@ -$(BUILTIN_QT): %-BUILTIN.o: .dep/%.dpp +$(BUILTIN_QT): BUILTIN_%.o: .dep/%.dpp $(BUILTIN_QT): %.o: %.moc - $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%-BUILTIN.moc=%.cpp) -$(BUILTIN_QT:%.o=%.moc): %-BUILTIN.moc: %.cpp + $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:BUILTIN_%.moc=%.cpp) +$(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp moc -i $< -o $@ # # Real targets # + ../../lib/qt.so: $(PLUGIN_QT) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT) diff --git a/plugins/qt/intf_qt.cpp b/plugins/qt/intf_qt.cpp index 0635255399..856107bad5 100644 --- a/plugins/qt/intf_qt.cpp +++ b/plugins/qt/intf_qt.cpp @@ -2,7 +2,7 @@ * intf_qt.cpp: Qt interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_qt.cpp,v 1.3 2001/04/15 10:54:46 sam Exp $ + * $Id: intf_qt.cpp,v 1.4 2001/04/16 07:40:11 sam Exp $ * * Authors: Samuel Hocevar * @@ -141,7 +141,7 @@ private: }; #ifdef BUILTIN -# include "intf_qt-BUILTIN.moc" +# include "BUILTIN_intf_qt.moc" #else # include "intf_qt.moc" #endif diff --git a/plugins/sdl/.cvsignore b/plugins/sdl/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/sdl/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/sdl/Makefile b/plugins/sdl/Makefile index 5117116b2f..d4511fb07b 100644 --- a/plugins/sdl/Makefile +++ b/plugins/sdl/Makefile @@ -3,52 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_SDL = sdl.o vout_sdl.o aout_sdl.o -BUILTIN_SDL = $(PLUGIN_SDL:%.o=%-BUILTIN.o) - -ALL_OBJ = $(PLUGIN_SDL) $(BUILTIN_SDL) +# +# Objects +# -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = sdl.o vout_sdl.o aout_sdl.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(PLUGIN_SDL): %.o: .dep/%.d -$(PLUGIN_SDL): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(BUILTIN_SDL): %-BUILTIN.o: .dep/%.d -$(BUILTIN_SDL): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/sdl.so: $(PLUGIN_SDL) + +../../lib/sdl.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) -../../lib/sdl.a: $(BUILTIN_SDL) +../../lib/sdl.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/text/.cvsignore b/plugins/text/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/text/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/text/Makefile b/plugins/text/Makefile index fb3b524583..2639f007f8 100644 --- a/plugins/text/Makefile +++ b/plugins/text/Makefile @@ -3,52 +3,30 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules -############################################################################### -# Objects and files -############################################################################### -PLUGIN_NCURSES = ncurses.o vout_ncurses.o -BUILTIN_NCURSES = $(PLUGIN_NCURSES:%.o=%-BUILTIN.o) - -ALL_OBJ = $(PLUGIN_NCURSES) $(BUILTIN_NCURSES) +# +# Objects +# -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = ncurses.o vout_ncurses.o +BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: - -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(PLUGIN_NCURSES): %.o: .dep/%.d -$(PLUGIN_NCURSES): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(BUILTIN_NCURSES): %-BUILTIN.o: .dep/%.d -$(BUILTIN_NCURSES): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # -../../lib/ncurses.so: $(PLUGIN_NCURSES) + +../../lib/ncurses.so: $(PLUGIN_C) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES) -../../lib/ncurses.a: $(BUILTIN_NCURSES) +../../lib/ncurses.a: $(BUILTIN_C) ar r $@ $^ diff --git a/plugins/x11/.cvsignore b/plugins/x11/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/x11/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/x11/Makefile b/plugins/x11/Makefile index 7871f47a0f..3d01c3995c 100644 --- a/plugins/x11/Makefile +++ b/plugins/x11/Makefile @@ -3,54 +3,32 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_X11 = x11.o vout_x11.o PLUGIN_XVIDEO = xvideo.o vout_xvideo.o -BUILTIN_X11 = $(PLUGIN_X11:%.o=%-BUILTIN.o) -BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_X11) $(PLUGIN_XVIDEO) -STD_BUILTIN_OBJ = $(BUILTIN_X11) $(BUILTIN_XVIDEO) - -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) +BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_%.o) +BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=BUILTIN_%.o) -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO) +BUILTIN_C = $(BUILTIN_X11) $(BUILTIN_XVIDEO) -export +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # + ../../lib/x11.so: $(PLUGIN_X11) ifeq ($(SYS),nto-qnx) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket diff --git a/plugins/yuv/.cvsignore b/plugins/yuv/.cvsignore new file mode 100644 index 0000000000..63e7180a26 --- /dev/null +++ b/plugins/yuv/.cvsignore @@ -0,0 +1 @@ +.dep diff --git a/plugins/yuv/Makefile b/plugins/yuv/Makefile index de0730d52c..40a0b92e11 100644 --- a/plugins/yuv/Makefile +++ b/plugins/yuv/Makefile @@ -3,54 +3,32 @@ # (c)2001 VideoLAN ############################################################################### -include ../../Makefile.modules +-include ../../Makefile.modules + +# +# Objects +# -############################################################################### -# Objects and files -############################################################################### PLUGIN_YUV = yuv.o video_yuv.o transforms_yuv.o PLUGIN_YUVMMX = yuvmmx.o video_yuvmmx.o transforms_yuvmmx.o -BUILTIN_YUV = $(PLUGIN_YUV:%.o=%-BUILTIN.o) -BUILTIN_YUVMMX = $(PLUGIN_YUVMMX:%.o=%-BUILTIN.o) - -STD_PLUGIN_OBJ = $(PLUGIN_YUV) $(PLUGIN_YUVMMX) -STD_BUILTIN_OBJ = $(BUILTIN_YUV) $(BUILTIN_YUVMMX) -ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) - -objects := $(ALL_OBJ) -cdependancies := $(objects:%.o=.dep/%.d) +BUILTIN_YUV = $(PLUGIN_YUV:%.o=BUILTIN_%.o) +BUILTIN_YUVMMX = $(PLUGIN_YUVMMX:%.o=BUILTIN_%.o) -export +PLUGIN_C = $(PLUGIN_YUV) $(PLUGIN_YUVMMX) +BUILTIN_C = $(BUILTIN_YUV) $(BUILTIN_YUVMMX) +ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # # Virtual targets # -all: -clean: - rm -f $(ALL_OBJ) - rm -f *.o *.moc *.bak *.builtin - rm -rf .dep - -FORCE: - -$(cdependancies): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ - -$(ALL_OBJ): %.o: ../../Makefile.dep Makefile - -$(STD_PLUGIN_OBJ): %.o: .dep/%.d -$(STD_PLUGIN_OBJ): %.o: %.c - $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $< - -$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d -$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c - $(CC) $(CFLAGS) -DBUILTIN -c -o $@ $< +include ../../Makefile.common # # Real targets # + ../../lib/yuv.so: $(PLUGIN_YUV) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_YUV) diff --git a/src/misc/modules.c b/src/misc/modules.c index dbaad51f84..40b4b923df 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -2,7 +2,7 @@ * modules.c : Built-in and plugin modules management functions ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules.c,v 1.24 2001/04/15 10:54:46 sam Exp $ + * $Id: modules.c,v 1.25 2001/04/16 07:40:11 sam Exp $ * * Authors: Samuel Hocevar * Ethan C. Baldridge @@ -273,7 +273,7 @@ void module_ManageBank( module_bank_t * p_bank ) } else { - intf_WarnMsg( 3, "module: hiding unused module `%s'", + intf_WarnMsg( 3, "module: hiding unused plugin module `%s'", p_module->psz_name ); HideModule( p_module ); -- 2.39.2