#
PLUGINS_DIR := 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 \
+ a52 \
+ lirc \
lpcm_adec \
macosx \
mad \
mpeg_system \
mpeg_adec \
mpeg_vdec \
+ network \
+ qnx \
qt \
sdl \
spudec \
text \
vcd \
+ win32 \
x11
PLUGINS_TARGETS := 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_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 \
dvdread/dvdread \
esd/esd \
fb/fb \
- filter/filter_bob \
- filter/filter_bob422 \
+ filter/filter_deinterlace \
+ filter/filter_transform \
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 \
+ a52/a52 \
+ 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 \
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_netlist 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 tests 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
all: Makefile.opts vlc ${ALIASES} vlc.app plugins po
Makefile.opts:
- @echo "**** No configuration found, running ./configure..."
- ./configure
- $(MAKE) $(MAKECMDGOALS)
- exit
+ @echo "**** No configuration found, please run ./configure"
+ @exit 1
+# ./configure
+# $(MAKE) $(MAKECMDGOALS)
+# exit
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
- @echo LCFLAGS: $(LCFLAGS)
+ @echo LDFLAGS: $(LDFLAGS)
@echo PCFLAGS: $(PCFLAGS)
- @echo PLCFLAGS: $(PLCFLAGS)
+ @echo PLDFLAGS: $(PLDFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
plugins-clean:
for dir in $(PLUGINS_DIR) ; do \
- ( cd plugins/$${dir} && $(MAKE) clean ) ; done
- rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
+ ( cd plugins/$${dir} \
+ && $(MAKE) -f ../../Makefile.modules clean ) ; done
+ rm -f plugins/*/*.o plugins/*/*.lo plugins/*/*.moc plugins/*/*.bak
vlc-clean:
rm -f $(C_OBJ) $(CPP_OBJ)
-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
# Create installation script
sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
# Copy relevant files
- cp vlc.exe plugins/directx.so plugins/gtk.so plugins/sdl.so tmp/
+ 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 ; \
- do cp ../win32-libs/$$file tmp/ ; 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 ; \
do cp share/$$file tmp/share/ ; done
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
#
# Generic rules (see below)
#
-$(C_DEP): %.d: FORCE
- @$(MAKE) -s --no-print-directory -f Makefile.dep $@
-
-$(CPP_DEP): %.dpp: FORCE
- @$(MAKE) -s --no-print-directory -f Makefile.dep $@
-
$(H_OBJ): Makefile.opts Makefile.dep Makefile
- rm -f $@ && cp $@.in $@
+# @echo "regenerating $@"
+ @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* );" >> $@ ; \
+ @for i in $(BUILTINS) ; do \
+ echo "int InitModule__MODULE_"$$i"( module_t* );" >>$@; \
+ echo "int ActivateModule__MODULE_"$$i"( module_t* );" >>$@; \
+ echo "int DeactivateModule__MODULE_"$$i"( module_t* );" >>$@; \
done
- echo "" >> $@ ;
- printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
- for i in $(BUILTINS) ; do \
- printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
+ @echo "" >> $@ ;
+endif
+ @echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@ ;
+ @echo " do \\" >> $@ ;
+ @echo " { \\" >> $@ ;
+ifneq (,$(BUILTINS))
+ @for i in $(BUILTINS) ; do \
+ echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
done
- echo "} while( 0 );" >> $@ ;
- echo "" >> $@ ;
endif
+ @echo " } while( 0 );" >> $@ ;
+ @echo "" >> $@ ;
+
+$(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
+$(C_OBJ): %.o: $(H_OBJ)
$(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(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) -c -o $@ $<
+ $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
$(RESOURCE_OBJ): %.o: Makefile.dep Makefile
ifneq (,(findstring mingw32,$(SYS)))
#
# Main application target
#
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
+ $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGIN_OBJ): FORCE
- @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
+ @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%)
#
# Built-in modules target
#
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTIN_OBJ): FORCE
- @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
+ @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%)
#
# libdvdcss target
projects / vlc / blobdiff