access \
alsa \
arts \
+ avi \
beos \
chroma \
directx \
dvdread \
esd \
fb \
+ ffmpeg \
filter \
fx \
ggi \
access/http \
alsa/alsa \
arts/arts \
+ avi/avi \
beos/beos \
chroma/chroma_i420_rgb \
chroma/chroma_i420_rgb_mmx \
dvdread/dvdread \
esd/esd \
fb/fb \
+ ffmpeg/ffmpeg \
filter/filter_deinterlace \
filter/filter_transform \
filter/filter_invert \
filter/filter_distort \
filter/filter_wall \
+ filter/filter_clone \
fx/fx_scope \
ggi/ggi \
glide/glide \
motion/motionmmxext \
motion/motion3dnow \
motion/motionaltivec \
+ mpeg_system/mpeg_audio \
mpeg_system/mpeg_es \
mpeg_system/mpeg_ps \
mpeg_system/mpeg_ts \
+ mpeg_system/mpeg_ts_dvbpsi \
mpeg_adec/mpeg_adec \
mpeg_vdec/mpeg_vdec \
network/ipv4 \
text/rc \
vcd/vcd \
win32/waveout \
- win32/win32 \
+ win32/intfwin \
x11/x11 \
x11/xvideo
RESOURCE_OBJ := share/vlc_win32_rc.o
endif
-VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
#
# Generated header
#
# Misc variables
#
-VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
+VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
# All symbols must be exported
export
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
- @echo DCFLAGS: $(DCFLAGS)
@echo LDFLAGS: $(LDFLAGS)
- @echo PCFLAGS: $(PCFLAGS)
- @echo PLDFLAGS: $(PLDFLAGS)
+ @echo plugins_CFLAGS: $(plugins_CFLAGS)
+ @echo plugins_LDFLAGS: $(plugins_LDFLAGS)
+ @echo builtins_CFLAGS: $(builtins_CFLAGS)
+ @echo builtins_LDFLAGS: $(builtins_LDFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
clean: plugins-clean po-clean vlc-clean
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so* lib/*.a
- rm -f plugins/*.so plugins/*.a
+ rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds
rm -rf extras/MacOSX/build
po-clean:
rm -f Makefile.opts
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 config*status config*cache config*log conftest*
rm -f gmon.out core build-stamp
rm -Rf .dep
rm -f .gdb_history
rm -Rf tmp/vlc/tmp
find debian -mindepth 1 -maxdepth 1 -type d | \
while read i ; do rm -Rf tmp/vlc/$$i ; done
- # Copy .c .h .in .cpp and .glade files
- find include src plugins -type f -name '*.[chig]*' | while read i ; \
+ # Copy .c .h .in .cpp .m and .glade files
+ find include src plugins -type f -name '*.[bcdhigmrst]*' | while read i ; \
do cp $$i tmp/vlc/$$i ; done
+ # Grmbl... special case...
+ for i in API BUGS DESIGN TODO ; \
+ do cp plugins/mad/$$i tmp/vlc/plugins/mad ; done
# Copy plugin Makefiles
find plugins -type f -name Makefile | while read i ; \
do cp $$i tmp/vlc/$$i ; done
-type d -name CVS -o -name '.*' -o -name '*.[o]' | \
while read i ; do rm -Rf $$i ; done
# Copy gettext stuff
- cp po/*.po tmp/vlc/po
+ cp po/ChangeLog po/vlc.pot po/*.po tmp/vlc/po
for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
# Copy misc files
cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
+ ABOUT-NLS BUGS MODULES vlc.spec \
Makefile Makefile.opts.in Makefile.dep Makefile.modules \
- configure configure.in install-sh install-win32 vlc.spec \
+ configure configure.in install-sh install-win32 macosx-dmg \
config.sub config.guess aclocal.m4 mkinstalldirs \
tmp/vlc/
# Copy Debian control files
for file in control changelog rules ; do \
cp debian/$$file tmp/vlc/debian/ ; done
# Copy ipkg control files
- for file in control rules ; do \
+ for file in control rules patch ; do \
cp ipkg/$$file tmp/vlc/ipkg/ ; done
# Copy fonts and icons
- for file in share/*png share/*xpm share/*psf ; do \
+ for file in share/*vlc* share/*psf; do \
cp $$file tmp/vlc/share ; done
- for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
- cp share/$$file tmp/vlc/share/ ; done
# Build archives
- F=vlc-${VLC_QUICKVERSION}; \
- mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \
- bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \
- gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz .
+ F=vlc-${VERSION}; \
+ mv tmp/vlc tmp/$$F; (cd tmp ; tar czf ../$$F.tar.gz $$F); \
# Clean up
rm -Rf tmp
echo "OK."; mkdir tmp; \
fi
# Create installation script
- sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
+ cp install-win32 tmp/nsi
# Copy relevant files
- cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/
+ cp vlc.exe tmp/
+ $(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
for file in AUTHORS COPYING ChangeLog README 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/plugins
+ cp $(PLUGINS:%=plugins/%.so) tmp/plugins/
+ # don't include these two
+ #rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
+ifneq (,$(PLUGINS))
+ for i in $(PLUGINS) ; do if test $$i != intfwin ; then $(STRIP) tmp/plugins/$$i.so ; fi ; done
+endif
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/share/ ; done
# Create package
- wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi
- mv tmp/vlc-${VLC_QUICKVERSION}.exe \
- vlc-${VLC_QUICKVERSION}-win32-installer.exe
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi
# Clean up
rm -Rf tmp
mkdir -p tmp/vlc/share
# Copy relevant files
cp vlc tmp/vlc/
+ strip tmp/vlc/vlc
cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
+ mkdir tmp/vlc/plugins
+ cp $(PLUGINS:%=plugins/%.so) tmp/vlc/plugins/
+ strip $(PLUGINS:%=tmp/vlc/plugins/%.so)
# Create package
- 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-x86.zip .
+ mv tmp/vlc tmp/vlc-${VERSION}
+ (cd tmp ; find vlc-${VERSION} | \
+ zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
+ mv tmp/vlc-${VERSION}-BeOS-x86.zip .
# Clean up
rm -Rf tmp
# Copy relevant files
cp -R vlc.app tmp/
- cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/
+ cp AUTHORS COPYING ChangeLog README README\ -\ Mac\ OS\ X.rtf FAQ TODO tmp/
# Create disk image
- ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/*
+ ./macosx-dmg 0 "vlc-${VERSION}" tmp/*
# Clean up
rm -Rf tmp
vlc.app: vlc plugins
ifneq (,$(findstring darwin,$(SYS)))
rm -Rf vlc.app
- cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
+ cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' | grep -v "^$$"
cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
$(INSTALL) -d vlc.app/Contents/MacOS/share
$(INSTALL) -d vlc.app/Contents/MacOS/plugins
$(C_OBJ): %.o: $(H_OBJ)
$(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c
- $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
+ $(CC) $(CFLAGS) $(vlc_CFLAGS) -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 $@ $<
+ $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
+
+$(M_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(M_OBJ): %.o: $(H_OBJ)
+$(M_OBJ): %.o: .dep/%.dm
+$(M_OBJ): %.o: %.m
+ $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
$(RESOURCE_OBJ): %.o: Makefile.dep Makefile
ifneq (,(findstring mingw32,$(SYS)))
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON)
+ $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
projects / vlc / blobdiff