Skip to content

V
vlc
Commit 6116299e authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Added .cvsignore files in the plugins directories.
  * Additional Makefile cleaning for built-in modules.
  * Fixed Makefile for Solaris target.
parent 5427a369
Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 821 deletions
.cvsignore
View file @ 6116299e
.* .*
*.ts
core core
dep .dep
gmon.out gmon.out
vlc
vlc-debug.log vlc-debug.log
vlc-debug.ct vlc-debug.ct
config.log config.log
config.cache config.cache
config.status config.status
Makefile Makefile.opts
Makefile.modules
build-stamp build-stamp
vlc
gvlc gvlc
fbvlc qvlc
kvlc
gnome-vlc
ChangeLog
View file @ 6116299e
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
HEAD HEAD
* Additional Makefile cleaning for built-in modules.
* Fixed Makefile for Solaris target.
* All Debian packages are now lintian-clean. * All Debian packages are now lintian-clean.
* Fixed XVideo plugin linking. * Fixed XVideo plugin linking.
* Updated TODO list. * Updated TODO list.
......
INSTALL
View file @ 6116299e
INSTALL file for vlc, the VideoLAN Client INSTALL file for vlc, the VideoLAN Client
Building VideoLAN Configuring VideoLAN
================= ====================
A typical way to configure vlc is: A typical way to configure vlc is:
...@@ -10,21 +10,28 @@ A typical way to configure vlc is: ...@@ -10,21 +10,28 @@ A typical way to configure vlc is:
See `./configure --help' for more information. See `./configure --help' for more information.
Then, run `make' to build vlc.
Here is a shortcut to copy-paste for a complete build: 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-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo \ --enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo
&& make
If you intend to debug stuff, you may want to disable optimizations: 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-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-alsa --enable-mga --enable-gtk --enable-qt --enable-xvideo \ --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 Installing and running VideoLAN
......
Makefile
View file @ 6116299e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN # vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
############################################################################### ###############################################################################
include Makefile.opts -include Makefile.opts
############################################################################### ###############################################################################
# Objects and files # Objects and files
...@@ -30,12 +30,6 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \ ...@@ -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 \ mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx 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 # C Objects
# #
...@@ -144,10 +138,14 @@ H_OBJ = include/modules_builtin.h ...@@ -144,10 +138,14 @@ H_OBJ = include/modules_builtin.h
# #
# Other lists of files # Other lists of files
# #
objects := $(C_OBJ) C_DEP := $(C_OBJ:%.o=.dep/%.d)
cdependancies := $(objects:%.o=.dep/%.d) CPP_DEP := $(CPP_OBJ:%.o=.dep/%.dpp)
cppobjects := $(CPP_OBJ)
cppdependancies := $(cppobjects:%.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 # All symbols must be exported
export export
...@@ -161,15 +159,6 @@ export ...@@ -161,15 +159,6 @@ export
# #
all: vlc ${ALIASES} plugins vlc.app 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: clean:
for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done
rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
...@@ -208,8 +197,8 @@ show: ...@@ -208,8 +197,8 @@ show:
@echo CPP_OBJ: $(CPP_OBJ) @echo CPP_OBJ: $(CPP_OBJ)
@echo objects: $(objects) @echo objects: $(objects)
@echo cppobjects: $(cppobjects) @echo cppobjects: $(cppobjects)
@echo PLUGINS_OBJ: $(PLUGINS_OBJ) @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
@echo BUILTINS_OBJ: $(BUILTINS_OBJ) @echo BUILTIN_OBJ: $(BUILTIN_OBJ)
# ugliest of all, but I have no time to do it -- sam # ugliest of all, but I have no time to do it -- sam
...@@ -221,10 +210,12 @@ snapshot: ...@@ -221,10 +210,12 @@ snapshot:
done done
find debian -mindepth 1 -maxdepth 1 -type d | \ find debian -mindepth 1 -maxdepth 1 -type d | \
while read i ; do rm -Rf /tmp/vlc-${PROGRAM_VERSION}/$$i ; done while read i ; do rm -Rf /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
# .c .h .in .cpp # .c .h .in .cpp .glade
find include src plugins -type f -name '*.[chi]*' | while read i ; \ find include src plugins -type f -name '*.[chig]*' | while read i ; \
do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; \ do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
done # Makefiles
find . plugins -type f -name Makefile | while read i ; \
do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
# extra files # extra files
cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras
cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc
...@@ -235,7 +226,7 @@ snapshot: ...@@ -235,7 +226,7 @@ snapshot:
done done
# copy misc files # copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO todo.pl \ 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 \ configure configure.in install-sh config.sub config.guess \
/tmp/vlc-${PROGRAM_VERSION}/ /tmp/vlc-${PROGRAM_VERSION}/
for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \ for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
...@@ -243,7 +234,7 @@ snapshot: ...@@ -243,7 +234,7 @@ snapshot:
vlc.menu ; do \ vlc.menu ; do \
cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \ cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
done 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 cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \ for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
cp share/$$icon.xpm share/$$icon.png \ cp share/$$icon.xpm share/$$icon.png \
...@@ -287,13 +278,13 @@ gnome-vlc gvlc kvlc qvlc: vlc ...@@ -287,13 +278,13 @@ gnome-vlc gvlc kvlc qvlc: vlc
# #
# Generic rules (see below) # Generic rules (see below)
# #
$(cdependancies): %.d: FORCE $(C_DEP): %.d: FORCE
@$(MAKE) -s --no-print-directory -f Makefile.dep $@ @$(MAKE) -s --no-print-directory -f Makefile.dep $@
$(cppdependancies): %.dpp: FORCE $(CPP_DEP): %.dpp: FORCE
@$(MAKE) -s --no-print-directory -f Makefile.dep $@ @$(MAKE) -s --no-print-directory -f Makefile.dep $@
$(H_OBJ): Makefile.opts Makefile $(H_OBJ): Makefile.opts Makefile.dep Makefile
rm -f $@ && cp $@.in $@ rm -f $@ && cp $@.in $@
for i in $(BUILTINS) ; do \ for i in $(BUILTINS) ; do \
echo "int module_"$$i"_InitModule (module_t *);" >> $@ ; \ echo "int module_"$$i"_InitModule (module_t *);" >> $@ ; \
...@@ -307,7 +298,7 @@ $(H_OBJ): Makefile.opts Makefile ...@@ -307,7 +298,7 @@ $(H_OBJ): Makefile.opts Makefile
done done
echo "};" >> $@ ; echo "};" >> $@ ;
$(C_OBJ): %.o: Makefile.dep $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(C_OBJ): %.o: .dep/%.d $(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c $(C_OBJ): %.o: %.c
ifneq (,$(findstring darwin,$(SYS))) ifneq (,$(findstring darwin,$(SYS)))
...@@ -317,7 +308,7 @@ else ...@@ -317,7 +308,7 @@ else
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
endif endif
$(CPP_OBJ): %.o: Makefile.dep $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(CPP_OBJ): %.o: .dep/%.dpp $(CPP_OBJ): %.o: .dep/%.dpp
$(CPP_OBJ): %.o: %.cpp $(CPP_OBJ): %.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
...@@ -325,8 +316,8 @@ $(CPP_OBJ): %.o: %.cpp ...@@ -325,8 +316,8 @@ $(CPP_OBJ): %.o: %.cpp
# #
# Main application target # Main application target
# #
vlc: $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTINS_OBJ) vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTINS_OBJ) $(LCFLAGS) $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
rm -f ./lib/_APP_ rm -f ./lib/_APP_
ln -s ../vlc ./lib/_APP_ ln -s ../vlc ./lib/_APP_
...@@ -337,14 +328,14 @@ endif ...@@ -337,14 +328,14 @@ endif
# #
# Plugins target # Plugins target
# #
plugins: $(PLUGINS_OBJ) plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGINS_OBJ): FORCE $(PLUGIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%) cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
# #
# Built-in modules target # Built-in modules target
# #
builtins: $(BUILTINS_OBJ) builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTINS_OBJ): FORCE $(BUILTIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%) cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
Makefile.common 0 → 100644
View file @ 6116299e
###############################################################################
# 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 $@ $<
Makefile.dep
View file @ 6116299e
...@@ -45,7 +45,7 @@ default: ...@@ -45,7 +45,7 @@ default:
-include $(MAKECMDGOALS) -include $(MAKECMDGOALS)
$(cdependancies): .dep/%.d: %.c $(C_DEP): .dep/%.d: %.c
@test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*) @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
#@echo "generating dependancies for $*.c" #@echo "generating dependancies for $*.c"
@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
...@@ -53,7 +53,7 @@ $(cdependancies): .dep/%.d: %.c ...@@ -53,7 +53,7 @@ $(cdependancies): .dep/%.d: %.c
.dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
[ -s $@ ] || rm -f $@' [ -s $@ ] || rm -f $@'
$(cppdependancies): .dep/%.dpp: %.cpp $(CPP_DEP): .dep/%.dpp: %.cpp
@test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*) @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
#@echo "generating dependancies for $*.c" #@echo "generating dependancies for $*.c"
@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
......
Makefile.opts.in
View file @ 6116299e
...@@ -89,7 +89,7 @@ PROGRAM_VERSION=@VLC_VERSION@ ...@@ -89,7 +89,7 @@ PROGRAM_VERSION=@VLC_VERSION@
# DEFINE will contain some of the constants definitions decided in Makefile, # DEFINE will contain some of the constants definitions decided in Makefile,
# including SYS_xx. It will be passed to C compiler. # 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) # On Linux activate 64-bit off_t (by default under BSD)
ifneq (,$(findstring linux,$(SYS))) ifneq (,$(findstring linux,$(SYS)))
...@@ -115,7 +115,7 @@ LIB += @LIB@ -L/usr/local/lib ...@@ -115,7 +115,7 @@ LIB += @LIB@ -L/usr/local/lib
# #
# Libraries needed by built-in modules # 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 # C compiler flags: mainstream compilation
......
include/.cvsignore
View file @ 6116299e
config.h config.h
defs.h defs.h
modules_builtin.h
plugins/alsa/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = alsa.o aout_alsa.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/alsa.so: $(PLUGIN_ALSA)
../../lib/alsa.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA)
../../lib/alsa.a: $(BUILTIN_ALSA) ../../lib/alsa.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/beos/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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)
cppobjects := $(NONSTD_CPP_PLUGIN_OBJ) $(NONSTD_CPP_BUILTIN_OBJ) PLUGIN_CPP = beos.o aout_beos.o vout_beos.o intf_beos.o DrawingTidbits.o TransportButton.o
cppdependancies := $(cppobjects:%.o=.dep/%.dpp) BUILTIN_CPP = $(PLUGIN_CPP:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_CPP) $(BUILTIN_CPP)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/beos.so: $(PLUGIN_BEOS)
../../lib/beos.so: $(PLUGIN_CPP)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS)
../../lib/beos.a: $(BUILTIN_BEOS) ../../lib/beos.a: $(BUILTIN_CPP)
ar r $@ $^ ar r $@ $^
plugins/darwin/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = darwin.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/darwin.so: $(PLUGIN_DARWIN)
../../lib/darwin.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DARWIN) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DARWIN)
../../lib/darwin.a: $(BUILTIN_DARWIN) ../../lib/darwin.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/dsp/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = dsp.o aout_dsp.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/dsp.so: $(PLUGIN_DSP)
../../lib/dsp.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dsp.a: $(BUILTIN_DSP) ../../lib/dsp.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/dummy/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = dummy.o aout_dummy.o vout_dummy.o intf_dummy.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/dummy.so: $(PLUGIN_DUMMY)
../../lib/dummy.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dummy.a: $(BUILTIN_DUMMY) ../../lib/dummy.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/dvd/Makefile
View file @ 6116299e
...@@ -3,52 +3,30 @@ ...@@ -3,52 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(ALL_OBJ) PLUGIN_C = dvd.o input_dvd.o dvd_netlist.o dvd_ioctl.o dvd_ifo.o dvd_udf.o dvd_css.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/dvd.so: $(PLUGIN_DVD)
../../lib/dvd.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dvd.a: $(BUILTIN_DVD) ../../lib/dvd.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/esd/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = esd.o aout_esd.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/esd.so: $(PLUGIN_ESD)
../../lib/esd.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD)
../../lib/esd.a: $(BUILTIN_ESD) ../../lib/esd.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/fb/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = fb.o vout_fb.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/fb.so: $(PLUGIN_FB)
../../lib/fb.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/fb.a: $(BUILTIN_FB) ../../lib/fb.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/ggi/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = ggi.o vout_ggi.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/ggi.so: $(PLUGIN_GGI)
../../lib/ggi.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI)
../../lib/ggi.a: $(BUILTIN_GGI) ../../lib/ggi.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/glide/Makefile
View file @ 6116299e
...@@ -3,49 +3,35 @@ ...@@ -3,49 +3,35 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_GLIDE = glide.o vout_glide.o 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) ALL_OBJ = $(PLUGIN_GLIDE) $(BUILTIN_GLIDE)
objects := $(PLUGIN_GLIDE) $(BUILTIN_GLIDE)
cdependancies := $(objects:%.o=.dep/%.d)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(PLUGIN_GLIDE): %.o: .dep/%.d $(PLUGIN_GLIDE): %.o: .dep/%.d
$(PLUGIN_GLIDE): %.o: %.c $(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
$(BUILTIN_GLIDE): %-BUILTIN.o: .dep/%.d $(BUILTIN_GLIDE): BUILTIN_%.o: .dep/%.d
$(BUILTIN_GLIDE): %-BUILTIN.o: %.c $(BUILTIN_GLIDE): BUILTIN_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/glide -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/glide -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/glide.so: $(PLUGIN_GLIDE) ../../lib/glide.so: $(PLUGIN_GLIDE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE)
......
plugins/gnome/Makefile
View file @ 6116299e
...@@ -3,49 +3,35 @@ ...@@ -3,49 +3,35 @@
# (c)2001 VideoLAN # (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 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) ALL_OBJ = $(PLUGIN_GNOME) $(BUILTIN_GNOME)
objects := $(PLUGIN_GNOME) $(BUILTIN_GNOME)
cdependancies := $(objects:%.o=.dep/%.d)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(PLUGIN_GNOME): %.o: .dep/%.d $(PLUGIN_GNOME): %.o: .dep/%.d
$(PLUGIN_GNOME): %.o: %.c $(PLUGIN_GNOME): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gtk gnomeui` -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gtk gnomeui` -c -o $@ $<
$(BUILTIN_GNOME): %-BUILTIN.o: .dep/%.d $(BUILTIN_GNOME): BUILTIN_%.o: .dep/%.d
$(BUILTIN_GNOME): %-BUILTIN.o: %.c $(BUILTIN_GNOME): BUILTIN_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN `gnome-config --cflags gtk gnomeui` -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN `gnome-config --cflags gtk gnomeui` -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/gnome.so: $(PLUGIN_GNOME) ../../lib/gnome.so: $(PLUGIN_GNOME)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
......
plugins/gtk/Makefile
View file @ 6116299e
...@@ -3,49 +3,35 @@ ...@@ -3,49 +3,35 @@
# (c)2001 VideoLAN # (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 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) ALL_OBJ = $(PLUGIN_GTK) $(BUILTIN_GTK)
objects := $(PLUGIN_GTK) $(BUILTIN_GTK)
cdependancies := $(objects:%.o=.dep/%.d)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(PLUGIN_GTK): %.o: .dep/%.d $(PLUGIN_GTK): %.o: .dep/%.d
$(PLUGIN_GTK): %.o: %.c $(PLUGIN_GTK): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $<
$(BUILTIN_GTK): %-BUILTIN.o: .dep/%.d $(BUILTIN_GTK): BUILTIN_%.o: .dep/%.d
$(BUILTIN_GTK): %-BUILTIN.o: %.c $(BUILTIN_GTK): BUILTIN_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN `gtk-config --cflags gtk` -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN `gtk-config --cflags gtk` -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/gtk.so: $(PLUGIN_GTK) ../../lib/gtk.so: $(PLUGIN_GTK)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
......
plugins/idct/Makefile
View file @ 6116299e
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_IDCT = idct.o PLUGIN_IDCT = idct.o
PLUGIN_IDCTCLASSIC = idctclassic.o PLUGIN_IDCTCLASSIC = idctclassic.o
PLUGIN_IDCTMMX = idctmmx.o PLUGIN_IDCTMMX = idctmmx.o
...@@ -15,73 +16,54 @@ PLUGIN_IDCTMMXEXT = idctmmxext.o ...@@ -15,73 +16,54 @@ PLUGIN_IDCTMMXEXT = idctmmxext.o
PLUGIN_IDCTALTIVEC = idctaltivec.o PLUGIN_IDCTALTIVEC = idctaltivec.o
PLUGIN_IDCTCOMMON = idct_common.o PLUGIN_IDCTCOMMON = idct_common.o
BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=%-BUILTIN-IDCT.o) \ BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=BUILTIN_IDCT_%.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCT.o) $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCT_%.o)
BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=%-BUILTIN-IDCTCLASSIC.o) \ BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=BUILTIN_IDCTCLASSIC_%.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTCLASSIC.o) $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTCLASSIC_%.o)
BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=%-BUILTIN-IDCTMMX.o) \ BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=BUILTIN_IDCTMMX_%.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMX.o) $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMX_%.o)
BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=%-BUILTIN-IDCTMMXEXT.o) \ BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=BUILTIN_IDCTMMXEXT_%.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMXEXT.o) $(PLUGIN_IDCTCOMMON:%.o=BUILTIN_IDCTMMXEXT_%.o)
BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=%-BUILTIN-IDCTALTIVEC.o) \ BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=BUILTIN_IDCTALTIVEC_%.o) \
$(PLUGIN_IDCTCOMMON:%.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)
objects := $(ALL_OBJ) PLUGIN_C = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
cdependancies := $(objects:%.o=.dep/%.d) ALL_OBJ = $(PLUGIN_C) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSIC) $(BUILTIN_IDCTMMX) $(BUILTIN_IDCTMMXEXT) $(BUILTIN_IDCTALTIVEC)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(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 $@ $<
$(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d $(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d
$(PLUGIN_IDCTALTIVEC): %.o: %.c $(PLUGIN_IDCTALTIVEC): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $<
$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: .dep/%.d $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: .dep/%.d
$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: %.c $(BUILTIN_IDCT): BUILTIN_IDCT_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idct -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idct -c -o $@ $<
$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: .dep/%.d $(BUILTIN_IDCTCLASSIC): BUILTIN_IDCTCLASSIC_%.o: .dep/%.d
$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: %.c $(BUILTIN_IDCTCLASSIC): BUILTIN_IDCTCLASSIC_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctclassic -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctclassic -c -o $@ $<
$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: .dep/%.d $(BUILTIN_IDCTMMX): BUILTIN_IDCTMMX_%.o: .dep/%.d
$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: %.c $(BUILTIN_IDCTMMX): BUILTIN_IDCTMMX_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmx -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmx -c -o $@ $<
$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: .dep/%.d $(BUILTIN_IDCTMMXEXT): BUILTIN_IDCTMMXEXT_%.o: .dep/%.d
$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: %.c $(BUILTIN_IDCTMMXEXT): BUILTIN_IDCTMMXEXT_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmxext -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmxext -c -o $@ $<
$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: .dep/%.d $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: .dep/%.d
$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: %.c $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) ../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
......
plugins/macosx/Makefile
View file @ 6116299e
...@@ -3,49 +3,35 @@ ...@@ -3,49 +3,35 @@
# (c)2001 VideoLAN # (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 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) ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
objects := $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
cdependancies := $(objects:%.o=.dep/%.d)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(PLUGIN_MACOSX): %.o: .dep/%.d $(PLUGIN_MACOSX): %.o: .dep/%.d
$(PLUGIN_MACOSX): %.o: %.c $(PLUGIN_MACOSX): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $< $(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $<
$(BUILTIN_MACOSX): %-BUILTIN.o: .dep/%.d $(BUILTIN_MACOSX): BUILTIN_%.o: .dep/%.d
$(BUILTIN_MACOSX): %-BUILTIN.o: %.c $(BUILTIN_MACOSX): BUILTIN_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/macosx.so: $(PLUGIN_MACOSX) ../../lib/macosx.so: $(PLUGIN_MACOSX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
......
plugins/mga/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = mga.o vout_mga.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/mga.so: $(PLUGIN_MGA)
../../lib/mga.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/mga.a: $(BUILTIN_MGA) ../../lib/mga.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/motion/Makefile
View file @ 6116299e
...@@ -3,67 +3,49 @@ ...@@ -3,67 +3,49 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_MOTION = motion.o vdec_motion_inner.o PLUGIN_MOTION = motion.o vdec_motion_inner.o
PLUGIN_MOTIONMMX = motionmmx.o vdec_motion_inner_mmx.o PLUGIN_MOTIONMMX = motionmmx.o vdec_motion_inner_mmx.o
PLUGIN_MOTIONMMXEXT = motionmmxext.o vdec_motion_inner_mmxext.o PLUGIN_MOTIONMMXEXT = motionmmxext.o vdec_motion_inner_mmxext.o
PLUGIN_MOTIONCOMMON = vdec_motion_common.o PLUGIN_MOTIONCOMMON = vdec_motion_common.o
BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=%-BUILTIN-MOTION.o) \ BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=BUILTIN_MOTION_%.o) \
$(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTION.o) $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTION_%.o)
BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=%-BUILTIN-MOTIONMMX.o) \ BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=BUILTIN_MOTIONMMX_%.o) \
$(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMX.o) $(PLUGIN_MOTIONCOMMON:%.o=BUILTIN_MOTIONMMX_%.o)
BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=%-BUILTIN-MOTIONMMXEXT.o) \ BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=BUILTIN_MOTIONMMXEXT_%.o) \
$(PLUGIN_MOTIONCOMMON:%.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)
objects := $(ALL_OBJ) PLUGIN_C = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
cdependancies := $(objects:%.o=.dep/%.d) ALL_OBJ = $(PLUGIN_C) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile $(BUILTIN_MOTION): BUILTIN_MOTION_%.o: .dep/%.d
$(BUILTIN_MOTION): BUILTIN_MOTION_%.o: %.c
$(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
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motion -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motion -c -o $@ $<
$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: .dep/%.d $(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: .dep/%.d
$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: %.c $(BUILTIN_MOTIONMMX): BUILTIN_MOTIONMMX_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmx -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmx -c -o $@ $<
$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: .dep/%.d $(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: .dep/%.d
$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: %.c $(BUILTIN_MOTIONMMXEXT): BUILTIN_MOTIONMMXEXT_%.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmxext -c -o $@ $< $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmxext -c -o $@ $<
# #
# Real targets # Real targets
# #
../../lib/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON) ../../lib/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
......
plugins/mpeg/Makefile
View file @ 6116299e
...@@ -3,53 +3,31 @@ ...@@ -3,53 +3,31 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_PS = ps.o input_ps.o PLUGIN_PS = ps.o input_ps.o
PLUGIN_TS = ts.o input_ts.o PLUGIN_TS = ts.o input_ts.o
BUILTIN_PS = $(PLUGIN_PS:%.o=%-BUILTIN.o) BUILTIN_PS = $(PLUGIN_PS:%.o=BUILTIN_%.o)
BUILTIN_TS = $(PLUGIN_TS:%.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)
export PLUGIN_C = $(PLUGIN_PS) $(PLUGIN_TS)
BUILTIN_C = $(BUILTIN_PS) $(BUILTIN_TS)
ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean: include ../../Makefile.common
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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/ps.so: $(PLUGIN_PS) ../../lib/ps.so: $(PLUGIN_PS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
......
plugins/null/Makefile
View file @ 6116299e
...@@ -3,54 +3,30 @@ ...@@ -3,54 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
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 := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ) PLUGIN_C = null.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/null.so: $(PLUGIN_NULL)
../../lib/null.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/null.a: $(BUILTIN_NULL) ../../lib/null.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/qt/Makefile
View file @ 6116299e
...@@ -3,37 +3,22 @@ ...@@ -3,37 +3,22 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_QT = qt.o intf_qt.o 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) ALL_OBJ = $(PLUGIN_QT) $(BUILTIN_QT)
cppobjects := $(ALL_OBJ)
cppdependancies := $(cppobjects:%.o=.dep/%.dpp)
export
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE:
$(cppdependancies): %.dpp: FORCE include ../../Makefile.common
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(PLUGIN_QT): %.o: .dep/%.dpp $(PLUGIN_QT): %.o: .dep/%.dpp
$(PLUGIN_QT): %.o: %.moc $(PLUGIN_QT): %.o: %.moc
...@@ -41,15 +26,16 @@ $(PLUGIN_QT): %.o: %.moc ...@@ -41,15 +26,16 @@ $(PLUGIN_QT): %.o: %.moc
$(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp $(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
moc -i $< -o $@ moc -i $< -o $@
$(BUILTIN_QT): %-BUILTIN.o: .dep/%.dpp $(BUILTIN_QT): BUILTIN_%.o: .dep/%.dpp
$(BUILTIN_QT): %.o: %.moc $(BUILTIN_QT): %.o: %.moc
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%-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 $(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp
moc -i $< -o $@ moc -i $< -o $@
# #
# Real targets # Real targets
# #
../../lib/qt.so: $(PLUGIN_QT) ../../lib/qt.so: $(PLUGIN_QT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
......
plugins/qt/intf_qt.cpp
View file @ 6116299e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_qt.cpp: Qt interface * intf_qt.cpp: Qt interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * 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 <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -141,7 +141,7 @@ private: ...@@ -141,7 +141,7 @@ private:
}; };
#ifdef BUILTIN #ifdef BUILTIN
# include "intf_qt-BUILTIN.moc" # include "BUILTIN_intf_qt.moc"
#else #else
# include "intf_qt.moc" # include "intf_qt.moc"
#endif #endif
......
plugins/sdl/Makefile
View file @ 6116299e
...@@ -3,52 +3,30 @@ ...@@ -3,52 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
PLUGIN_SDL = sdl.o vout_sdl.o aout_sdl.o
BUILTIN_SDL = $(PLUGIN_SDL:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_SDL) $(BUILTIN_SDL)
objects := $(ALL_OBJ) PLUGIN_C = sdl.o vout_sdl.o aout_sdl.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/sdl.so: $(PLUGIN_SDL)
../../lib/sdl.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
../../lib/sdl.a: $(BUILTIN_SDL) ../../lib/sdl.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/text/Makefile
View file @ 6116299e
...@@ -3,52 +3,30 @@ ...@@ -3,52 +3,30 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
############################################################################### #
# Objects and files # Objects
############################################################################### #
PLUGIN_NCURSES = ncurses.o vout_ncurses.o
BUILTIN_NCURSES = $(PLUGIN_NCURSES:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_NCURSES) $(BUILTIN_NCURSES)
objects := $(ALL_OBJ) PLUGIN_C = ncurses.o vout_ncurses.o
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.builtin
rm -rf .dep
FORCE: include ../../Makefile.common
$(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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/ncurses.so: $(PLUGIN_NCURSES)
../../lib/ncurses.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES)
../../lib/ncurses.a: $(BUILTIN_NCURSES) ../../lib/ncurses.a: $(BUILTIN_C)
ar r $@ $^ ar r $@ $^
plugins/x11/Makefile
View file @ 6116299e
...@@ -3,54 +3,32 @@ ...@@ -3,54 +3,32 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_X11 = x11.o vout_x11.o PLUGIN_X11 = x11.o vout_x11.o
PLUGIN_XVIDEO = xvideo.o vout_xvideo.o PLUGIN_XVIDEO = xvideo.o vout_xvideo.o
BUILTIN_X11 = $(PLUGIN_X11:%.o=%-BUILTIN.o) BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_%.o)
BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.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)
objects := $(ALL_OBJ) PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO)
cdependancies := $(objects:%.o=.dep/%.d) BUILTIN_C = $(BUILTIN_X11) $(BUILTIN_XVIDEO)
export ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean: include ../../Makefile.common
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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/x11.so: $(PLUGIN_X11) ../../lib/x11.so: $(PLUGIN_X11)
ifeq ($(SYS),nto-qnx) ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket
......
plugins/yuv/Makefile
View file @ 6116299e
...@@ -3,54 +3,32 @@ ...@@ -3,54 +3,32 @@
# (c)2001 VideoLAN # (c)2001 VideoLAN
############################################################################### ###############################################################################
include ../../Makefile.modules -include ../../Makefile.modules
#
# Objects
#
###############################################################################
# Objects and files
###############################################################################
PLUGIN_YUV = yuv.o video_yuv.o transforms_yuv.o PLUGIN_YUV = yuv.o video_yuv.o transforms_yuv.o
PLUGIN_YUVMMX = yuvmmx.o video_yuvmmx.o transforms_yuvmmx.o PLUGIN_YUVMMX = yuvmmx.o video_yuvmmx.o transforms_yuvmmx.o
BUILTIN_YUV = $(PLUGIN_YUV:%.o=%-BUILTIN.o) BUILTIN_YUV = $(PLUGIN_YUV:%.o=BUILTIN_%.o)
BUILTIN_YUVMMX = $(PLUGIN_YUVMMX:%.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)
export PLUGIN_C = $(PLUGIN_YUV) $(PLUGIN_YUVMMX)
BUILTIN_C = $(BUILTIN_YUV) $(BUILTIN_YUVMMX)
ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C)
# #
# Virtual targets # Virtual targets
# #
all:
clean: include ../../Makefile.common
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 $@ $<
# #
# Real targets # Real targets
# #
../../lib/yuv.so: $(PLUGIN_YUV) ../../lib/yuv.so: $(PLUGIN_YUV)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_YUV) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_YUV)
......
src/misc/modules.c
View file @ 6116299e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules.c : Built-in and plugin modules management functions * modules.c : Built-in and plugin modules management functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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 <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com> * Ethan C. Baldridge <BaldridgeE@cadmus.com>
...@@ -273,7 +273,7 @@ void module_ManageBank( module_bank_t * p_bank ) ...@@ -273,7 +273,7 @@ void module_ManageBank( module_bank_t * p_bank )
} }
else else
{ {
intf_WarnMsg( 3, "module: hiding unused module `%s'", intf_WarnMsg( 3, "module: hiding unused plugin module `%s'",
p_module->psz_name ); p_module->psz_name );
HideModule( p_module ); HideModule( p_module );
......
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