Commit 6116299e authored by Sam Hocevar's avatar Sam Hocevar

  * Added .cvsignore files in the plugins directories.
  * Additional Makefile cleaning for built-in modules.
  * Fixed Makefile for Solaris target.
parent 5427a369
.*
*.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
......@@ -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.
......
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
......
......@@ -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) $(@:%=../../%)
###############################################################################
# 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 $@ $<
......@@ -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 $< \
......
......@@ -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
......
config.h
defs.h
modules_builtin.h
......@@ -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 $@ $^
......@@ -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 $@ $^
......@@ -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 $@ $^
......@@ -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 $@ $^
......@@ -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 $@ $^
......@@ -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 $@ $^