#
# All possible plugin directories, needed for make clean
#
-PLUGINS_DIR := ac3_adec \
+PLUGINS_DIR := a52 \
+ aa \
+ ac3_adec \
ac3_spdif \
+ access \
alsa \
arts \
beos \
chroma \
directx \
+ downmix \
dsp \
dummy \
dvd \
esd \
fb \
filter \
+ fx \
ggi \
glide \
gtk \
- downmix \
idct \
imdct \
kde \
+ lirc \
lpcm_adec \
macosx \
mad \
mpeg_system \
mpeg_adec \
mpeg_vdec \
+ network \
+ qnx \
qt \
+ satellite \
sdl \
spudec \
text \
vcd \
+ win32 \
x11
-PLUGINS_TARGETS := ac3_adec/ac3_adec \
+PLUGINS_TARGETS := a52/a52 \
+ aa/aa \
+ ac3_adec/ac3_adec \
ac3_spdif/ac3_spdif \
+ access/file \
+ access/udp \
+ access/http \
alsa/alsa \
arts/arts \
beos/beos \
- chroma/chroma_yv12_rgb8 \
- chroma/chroma_yv12_rgb16 \
+ chroma/chroma_i420_rgb \
+ chroma/chroma_i420_rgb_mmx \
+ chroma/chroma_i420_yuy2 \
+ chroma/chroma_i420_yuy2_mmx \
+ chroma/chroma_i422_yuy2 \
+ chroma/chroma_i422_yuy2_mmx \
+ chroma/chroma_i420_ymga \
+ chroma/chroma_i420_ymga_mmx \
directx/directx \
+ downmix/downmix \
+ downmix/downmixsse \
+ downmix/downmix3dn \
dsp/dsp \
dummy/dummy \
dummy/null \
filter/filter_invert \
filter/filter_distort \
filter/filter_wall \
+ fx/fx_scope \
ggi/ggi \
glide/glide \
gtk/gnome \
gtk/gtk \
- downmix/downmix \
- downmix/downmixsse \
- downmix/downmix3dn \
idct/idct \
idct/idctclassic \
idct/idctmmx \
imdct/imdct3dn \
imdct/imdctsse \
kde/kde \
+ lirc/lirc \
lpcm_adec/lpcm_adec \
macosx/macosx \
mad/mad \
memcpy/memcpymmxext \
memcpy/memcpy3dn \
mga/mga \
+ mga/xmga \
motion/motion \
motion/motionmmx \
motion/motionmmxext \
mpeg_system/mpeg_ts \
mpeg_adec/mpeg_adec \
mpeg_vdec/mpeg_vdec \
+ network/ipv4 \
+ network/ipv6 \
+ qnx/qnx \
qt/qt \
+ satellite/satellite \
sdl/sdl \
spudec/spudec \
+ text/logger \
text/ncurses \
text/rc \
vcd/vcd \
+ win32/waveout \
+ win32/win32 \
x11/x11 \
- x11/xvideo \
- yuv/yuv \
- yuv/yuvmmx
+ x11/xvideo
#
# C Objects
#
-INTERFACE := main interface intf_msg intf_playlist
-INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
+INTERFACE := main interface intf_msg intf_playlist intf_eject
+INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
-MISC := mtime modules netutils iso_lang
+AUDIO_OUTPUT := audio_output aout_ext-dec aout_pcm aout_spdif
+MISC := mtime modules configuration netutils iso_lang
C_OBJ := $(INTERFACE:%=src/interface/%.o) \
$(INPUT:%=src/input/%.o) \
C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
endif
+ifeq ($(NEED_SYMBOLS),1)
+C_OBJ += src/misc/symbols.o
+endif
+
ifeq ($(SYS),beos)
CPP_OBJ := src/misc/beos_specific.o
endif
-cd po && $(MAKE) maintainer-clean
rm -f **/*.o **/*~ *.log
rm -f Makefile.opts
- rm -f include/defs.h include/config.h include/modules_builtin.h
+ rm -f include/defs.h include/modules_builtin.h
rm -f src/misc/modules_builtin.h
rm -f config*status config*cache config*log
rm -f gmon.out core build-stamp
libdvdcss-uninstall:
-cd extras/libdvdcss && $(MAKE) uninstall
+libdvdread-install:
+ -cd extras/libdvdread && $(MAKE) install
+
+libdvdread-uninstall:
+ -cd extras/libdvdread && $(MAKE) uninstall
+
po-install:
-cd po && $(MAKE) install
sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
# Copy relevant files
cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/
- cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
- README README.libdvdcss FAQ TODO tmp/
- for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
- gnu-intl.dll SDL.dll README-SDL.txt ; \
+ cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
+ for file in AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+ README README.libdvdcss FAQ TODO ; \
+ do cp $$file tmp/$${file}.txt ; \
+ unix2dos tmp/$${file}.txt ; done
+ for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \
+ libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \
+ libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \
do cp ${DLL_PATH}/$$file tmp/ ; done
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION}
(cd tmp ; find vlc-${VLC_QUICKVERSION} | \
zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip )
- mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip .
+ mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip .
+ # Clean up
+ rm -Rf tmp
+
+package-macosx:
+ # Check that tmp isn't in the way
+ @if test -e tmp; then \
+ echo "Error: please remove ./tmp, it is in the way"; false; \
+ else \
+ echo "OK."; mkdir tmp; \
+ fi
+
+ # Copy relevant files
+ cp -R vlc.app tmp/
+ cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+ README README.libdvdcss FAQ TODO tmp/
+
+ # Create disk image
+ ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/*
+
# Clean up
rm -Rf tmp
rm -Rf tmp/vlc/ipkg
# Remove useless headers
rm -f tmp/vlc/include/*
- for file in defs.h.in config.h.in common.h int_types.h ; \
+ for file in defs.h.in config.h common.h int_types.h ; \
do cp include/$$file tmp/vlc/include/ ; done
# Remove misc files (??? - maybe not really needed)
rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt
rm -f $@ && ln -s vlc $@
.PHONY: vlc.app
-vlc.app: Makefile.opts
+vlc.app: vlc plugins
ifneq (,$(findstring darwin,$(SYS)))
rm -Rf vlc.app
cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
@for i in $(BUILTINS) ; do \
echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
done
+endif
@echo " } while( 0 );" >> $@ ;
@echo "" >> $@ ;
-endif
$(C_DEP): %.d: FORCE
@$(MAKE) -s --no-print-directory -f Makefile.dep $@
$(CPP_DEP): %.dpp: FORCE
@$(MAKE) -s --no-print-directory -f Makefile.dep $@
-$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile $(H_OBJ)
+$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(C_OBJ): %.o: $(H_OBJ)
$(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(CPP_OBJ): %.o: $(H_OBJ)
$(CPP_OBJ): %.o: .dep/%.dpp
$(CPP_OBJ): %.o: %.cpp
$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@