# All possible plugin directories, needed for make clean
#
PLUGINS_DIR := alsa beos darwin dsp dummy \
- dvd esd fb ggi glide gnome gtk \
- idct \
+ dvd esd fb ggi glide gtk \
+ downmix idct imdct \
macosx mga \
motion \
mpeg null qt sdl \
# All possible plugin objects
#
PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
- dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gnome/gnome gtk/gtk \
+ dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk \
+ downmix/downmix downmix/downmixsse downmix/downmix3dn \
idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \
+ imdct/imdct imdct/imdct3dn imdct/imdctsse \
macosx/macosx mga/mga \
motion/motion motion/motionmmx motion/motionmmxext \
- mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
- text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
+ mpeg/es mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
+ text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
#
# C Objects
INTERFACE = src/interface/main.o \
src/interface/interface.o \
src/interface/intf_msg.o \
- src/interface/intf_cmd.o \
- src/interface/intf_ctrl.o \
src/interface/intf_playlist.o \
- src/interface/intf_channels.o \
- src/interface/intf_console.o \
- src/interface/intf_urldecode.o \
+ src/interface/intf_channels.o
-INPUT = src/input/input_ext-dec.o \
+INPUT = src/input/input.o \
+ src/input/input_ext-dec.o \
src/input/input_ext-intf.o \
src/input/input_dec.o \
src/input/input_programs.o \
src/input/input_netlist.o \
src/input/input_clock.o \
- src/input/input.o \
src/input/mpeg_system.o
AUDIO_OUTPUT = src/audio_output/audio_output.o \
- src/audio_output/aout_fifo.o \
+ src/audio_output/aout_ext-dec.o \
src/audio_output/aout_u8.o \
src/audio_output/aout_s8.o \
src/audio_output/aout_u16.o \
- src/audio_output/aout_s16.o
+ src/audio_output/aout_s16.o \
+ src/audio_output/aout_spdif.o
VIDEO_OUTPUT = src/video_output/video_output.o \
src/video_output/video_text.o \
src/ac3_decoder/ac3_bit_allocate.o \
src/ac3_decoder/ac3_mantissa.o \
src/ac3_decoder/ac3_rematrix.o \
- src/ac3_decoder/ac3_imdct.o \
- src/ac3_decoder/ac3_downmix.o \
- src/ac3_decoder/ac3_downmix_c.o
+ src/ac3_decoder/ac3_imdct.o
+
+AC3_SPDIF = src/ac3_spdif/ac3_spdif.o \
+ src/ac3_spdif/ac3_iec958.o
LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
src/lpcm_decoder/lpcm_decoder.o
MISC = src/misc/mtime.o \
src/misc/tests.o \
- src/misc/rsc_files.o \
src/misc/modules.o \
src/misc/netutils.o
$(VIDEO_OUTPUT) \
$(AUDIO_OUTPUT) \
$(AC3_DECODER) \
+ $(AC3_SPDIF) \
$(LPCM_DECODER) \
$(AUDIO_DECODER) \
$(SPU_DECODER) \
#
# 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)
+ifneq (,$(PLUGINS))
+PLUGIN_OBJ := $(shell for i in $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.so@' -e 's@^ .*@@' ; done)
+endif
+ifneq (,$(BUILTINS))
+BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@lib/\1.a@' -e 's@^ .*@@' ; done)
+endif
# All symbols must be exported
export
all: vlc ${ALIASES} plugins vlc.app
clean:
- for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done
+ for dir in $(PLUGINS_DIR) ; do \
+ ( cd plugins/$${dir} && $(MAKE) clean ) ; done
rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
rm -f $(C_OBJ) $(CPP_OBJ)
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so lib/*.a vlc gnome-vlc gvlc kvlc qvlc
- rm -rf vlc.app
+ rm -Rf vlc.app
distclean: clean
rm -f **/*.o **/*~ *.log
- rm -f Makefile.opts Makefile.modules
+ rm -f Makefile.opts
rm -f include/defs.h include/config.h include/modules_builtin.h
- rm -f config.status config.cache config.log
+ rm -f config*status config*cache config*log
rm -f gmon.out core build-stamp
rm -Rf .dep
rm -f .gdb_history
install:
mkdir -p $(DESTDIR)$(bindir)
$(INSTALL) vlc $(DESTDIR)$(bindir)
-# ugly
- for alias in "" ${ALIASES} ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done
+ifneq (,$(ALIASES))
+ for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done
+endif
mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
+ifneq (,$(PLUGINS))
$(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(DESTDIR)$(libdir)/videolan/vlc
+endif
mkdir -p $(DESTDIR)$(datadir)/videolan
$(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/videolan
$(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
# ugliest of all, but I have no time to do it -- sam
-snapshot:
+snapshot: Makefile.opts
rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
# copy archive in /tmp
find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
done
# copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO todo.pl \
- Makefile.opts.in Makefile.dep Makefile.modules.in \
+ Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh config.sub config.guess \
/tmp/vlc-${PROGRAM_VERSION}/
for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
- changelog changelog-css rules rules-css vlc.dirs \
- vlc.menu ; do \
+ changelog changelog-css rules rules-css vlc.dirs vlc.desktop \
+ gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
done
for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns ; do \
.PHONY: vlc.app
vlc.app:
ifneq (,$(findstring darwin,$(SYS)))
- rm -rf vlc.app
+ rm -Rf vlc.app
mkdir -p vlc.app/Contents/Resources
mkdir -p vlc.app/Contents/MacOS/lib
mkdir -p vlc.app/Contents/MacOS/share
$(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
$(INSTALL) vlc vlc.app/Contents/MacOS/
$(INSTALL) share/vlc.icns vlc.app/Contents/Resources/
+ifneq (,$(PLUGINS))
$(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
+endif
$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
endif
$(H_OBJ): Makefile.opts Makefile.dep Makefile
rm -f $@ && cp $@.in $@
+ifneq (,$(BUILTINS))
for i in $(BUILTINS) ; do \
- echo "int module_"$$i"_InitModule (module_t *);" >> $@ ; \
- echo "int module_"$$i"_ActivateModule (module_t *);" >> $@ ; \
- echo "int module_"$$i"_DeactivateModule (module_t *);" >> $@ ; \
+ echo "int module_"$$i"_InitModule( module_t* );" >> $@ ; \
+ echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \
+ echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
done
- echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@ ;
- echo "{ \\" >> $@ ;
+endif
+ echo "" >> $@ ;
+ printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
+ifneq (,$(BUILTINS))
for i in $(BUILTINS) ; do \
- echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
+ printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
done
- echo "};" >> $@ ;
+endif
+ echo "} while( 0 );" >> $@ ;
+ echo "" >> $@ ;
$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c
-ifneq (,$(findstring darwin,$(SYS)))
-#this is uglier of all
- @if test "src/ac3_decoder/ac3_imdct.c" = "$<"; then $(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<; echo "(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<"; else $(CC) $(CFLAGS) -c -o $@ $<; echo "$(CC) $(CFLAGS) -c -o $@ $<"; fi
-else
$(CC) $(CFLAGS) -c -o $@ $<
-endif
$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(CPP_OBJ): %.o: .dep/%.dpp
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+ $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB)
ifeq ($(SYS),beos)
rm -f ./lib/_APP_
ln -s ../vlc ./lib/_APP_
projects / vlc / blobdiff