X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=86a8a751d79da3bc30167702caccfeb54fc0aed9;hb=84cad9ba868a20f981ddb428f82c4fdd30bc5e38;hp=abd5644551a9d9852877b7fe2dea6876fb642eb4;hpb=5a8df6b09e7dc69032adb110ec238c810d888782;p=vlc diff --git a/Makefile.am b/Makefile.am index abd5644551..86a8a751d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,12 +11,13 @@ NULL = # - modules should come before . because vlc needs the builtins # - . should come before mozilla because the plugin needs libvlc_pic.a # - po should come before . because VLC.app needs the pofiles -SUBDIRS = intl modules po . mozilla share m4 -DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools +SUBDIRS = intl modules po . mozilla share m4 doc +DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools EXTRA_DIST = \ HACKING \ INSTALL.win32 \ + vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ bootstrap \ @@ -77,7 +78,7 @@ HEADERS_include = \ include/input_ext-plugins.h \ include/intf_eject.h \ include/iso_lang.h \ - include/httpd.h \ + include/vlc_httpd.h \ include/main.h \ include/mmx.h \ include/modules.h \ @@ -89,13 +90,21 @@ HEADERS_include = \ include/stream_output.h \ include/variables.h \ include/video_output.h \ + include/vlc_bits.h \ include/vlc_block.h \ + include/vlc_block_helper.h \ + include/vlc_codec.h \ include/vlc_common.h \ include/vlc_config.h \ include/vlc_cpu.h \ include/vlc_error.h \ + include/vlc_es.h \ + include/vlc_help.h \ include/vlc_interface.h \ + include/vlc_keys.h \ include/vlc_messages.h \ + include/vlc_meta.h \ + include/vlc_vlm.h \ include/vlc_objects.h \ include/vlc_playlist.h \ include/vlc_threads.h \ @@ -173,17 +182,32 @@ EXTRA_DIST += \ extras/MacOSX/Resources/vob.icns \ extras/MacOSX/Resources/wma.icns \ extras/MacOSX/Resources/wmv.icns \ - extras/MacOSX/Resources/back.png \ - extras/MacOSX/Resources/begin.png \ - extras/MacOSX/Resources/end.png \ - extras/MacOSX/Resources/forw.png \ - extras/MacOSX/Resources/list.png \ extras/MacOSX/Resources/pause.png \ + extras/MacOSX/Resources/pause_blue.png \ extras/MacOSX/Resources/play.png \ - extras/MacOSX/Resources/prefs.png \ - extras/MacOSX/Resources/slow.png \ + extras/MacOSX/Resources/play_blue.png \ extras/MacOSX/Resources/stop.png \ - extras/MacOSX/Resources/vlc_hg.png \ + extras/MacOSX/Resources/stop_blue.png \ + extras/MacOSX/Resources/display.png \ + extras/MacOSX/Resources/display_slider.png \ + extras/MacOSX/Resources/display_track.png \ + extras/MacOSX/Resources/fullscreen_active.png \ + extras/MacOSX/Resources/fullscreen_blue.png \ + extras/MacOSX/Resources/next_active.png \ + extras/MacOSX/Resources/next_blue.png \ + extras/MacOSX/Resources/playlistdrawer_active.png \ + extras/MacOSX/Resources/playlistdrawer_blue.png \ + extras/MacOSX/Resources/previous_active.png \ + extras/MacOSX/Resources/previous_blue.png \ + extras/MacOSX/Resources/skip_forward_active.png \ + extras/MacOSX/Resources/skip_forward_blue.png \ + extras/MacOSX/Resources/skip_previous_active.png \ + extras/MacOSX/Resources/skip_previous_blue.png \ + extras/MacOSX/Resources/volume_high.png \ + extras/MacOSX/Resources/volume_low.png \ + extras/MacOSX/Resources/volumeslider_blue.png \ + extras/MacOSX/Resources/volumeslider_normal.png \ + extras/MacOSX/Resources/volumetrack.png \ extras/MacOSX/Resources/about_bg.png \ extras/MacOSX/Resources/vlc.scriptSuite \ extras/MacOSX/Resources/README \ @@ -250,8 +274,10 @@ if BUILD_GETOPT OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) endif if BUILD_MOZILLA +if !HAVE_WIN32 LIBRARIES_libvlc_pic = lib/libvlc_pic.a endif +endif EXTRA_DIST += \ $(SOURCES_libvlc_beos) \ @@ -290,23 +316,30 @@ SOURCES_libvlc_common = \ src/interface/interface.c \ src/interface/intf_eject.c \ src/playlist/playlist.c \ + src/playlist/sort.c \ + src/playlist/loadsave.c \ + src/playlist/group.c \ + src/playlist/item.c \ + src/playlist/item-ext.c \ + src/playlist/info.c \ src/input/input.c \ + src/input/control.c \ + src/input/es_out.c \ src/input/stream.c \ src/input/demux.c \ + src/input/subtitles.c \ src/input/input_ext-plugins.c \ - src/input/input_ext-dec.c \ src/input/input_ext-intf.c \ src/input/input_dec.c \ src/input/input_programs.c \ src/input/input_clock.c \ - src/input/input_info.c \ src/video_output/video_output.c \ src/video_output/vout_pictures.c \ src/video_output/vout_pictures.h \ src/video_output/video_text.c \ - src/video_output/video_text.h \ src/video_output/vout_subpictures.c \ src/video_output/vout_synchro.c \ + src/video_output/vout_intf.c \ src/audio_output/common.c \ src/audio_output/dec.c \ src/audio_output/filters.c \ @@ -315,7 +348,10 @@ SOURCES_libvlc_common = \ src/audio_output/output.c \ src/audio_output/intf.c \ src/stream_output/stream_output.c \ + src/stream_output/announce.c \ + src/stream_output/sap.c \ src/misc/charset.c \ + src/misc/httpd.c \ src/misc/mtime.c \ src/misc/block.c \ src/misc/modules.c \ @@ -328,6 +364,8 @@ SOURCES_libvlc_common = \ src/misc/objects.c \ src/misc/variables.c \ src/misc/error.c \ + src/misc/net.c \ + src/misc/vlm.c \ src/extras/libc.c \ $(NULL) @@ -436,6 +474,8 @@ VLC.app: vlc output.m \ playlist.h \ playlist.m \ + prefs_widgets.h \ + prefs_widgets.m \ prefs.h \ prefs.m \ vout.h \ @@ -443,7 +483,7 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ $(top_builddir)/VLC.app rm -Rf $(top_builddir)/tmp @@ -456,13 +496,21 @@ VLC.app: vlc then $(INSTALL) "$$i$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done + if test -d $(top_builddir)/extras/contrib/vlc-lib; then \ + mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ + for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + done ; \ + fi $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http - $(INSTALL) -m 644 $(srcdir)/share/http/*.html \ - $(top_builddir)/VLC.app/Contents/MacOS/share/http + for i in $(srcdir)/share/http/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \ + done ; \ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin - $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \ - $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin + for i in $(srcdir)/share/http/admin/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \ + done ; \ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -523,6 +571,7 @@ package-win32-base: cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi" # Copy relevant files cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" + cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/" $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ @@ -553,14 +602,30 @@ package-win32-base: for i in $(srcdir)/doc/skins/*.txt; do \ cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \ done + mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts + for i in $(srcdir)/share/skins2/fonts/*.*; do \ + cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \ + done + mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default + for i in $(srcdir)/share/skins2/default/*.*; do \ + cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \ + done mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin" cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ; + cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/admin/*.html \ $(srcdir)/vlc-${VERSION}/http/admin/ ; cp $(srcdir)/share/http/admin/.access \ $(srcdir)/vlc-${VERSION}/http/admin/ ; + mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" +if BUILD_MOZILLA + cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; + $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + cp $(srcdir)/mozilla/vlcintf.xpt $(srcdir)/vlc-${VERSION}/mozilla/ ; +endif + package-win32-base-exe: # Create package wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ @@ -586,45 +651,38 @@ package-beos: # Check that tmp isn't in the way @if test -e $(srcdir)/tmp; then \ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false; \ + false ; \ else \ - echo "OK."; mkdir $(srcdir)/tmp; \ + echo "OK." ; mkdir $(srcdir)/tmp ; \ fi # Copy relevant files - mkdir -p $(srcdir)/tmp/vlc + mkdir -p $(srcdir)/tmp/vlc ; cd $(srcdir) && \ - cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ + cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ; # We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell... if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ - mkdir -p $(srcdir)/tmp/vlc/plugins; \ - find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \ + mkdir -p $(srcdir)/tmp/vlc/plugins ; \ + find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \ fi for i in $(ALL_LINGUAS); do \ mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ done -# Create package with debug symbols - mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) - mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ - -# Create package without debug symbols - mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc - strip $(srcdir)/tmp/vlc/vlc +# Strip files and create package + strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; if [ -d $(srcdir)/tmp/vlc/plugins ]; then \ - strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \ + strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \ fi - xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc - mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} + xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; + find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; + mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) - mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ + mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; # Clean up - rm -Rf $(srcdir)/tmp + rm -Rf $(srcdir)/tmp ; package-macosx: # Check that tmp isn't in the way @@ -640,11 +698,39 @@ package-macosx: cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ # Create disk image - $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/* + $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/* # Clean up rm -Rf $(top_builddir)/tmp +package-translations: + @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ + echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \ + fi +# Copy translations + for i in $(ALL_LINGUAS); do \ + cp "$(srcdir)/po/$${i}.po" \ + "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \ + || true ; \ + done + cp "$(srcdir)/doc/translations.txt" \ + "$(srcdir)/vlc-translations-${VERSION}/README.txt" + + echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo 'if test $$# != 1; then' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo " echo \"Usage: convert-po.sh <.po file>\"" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo " exit 1" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo "fi" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + echo 'msgfmt --statistics -o vlc.mo $$1' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh" + + $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \ + | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz + ############################################################################### # Stamp rules ###############################################################################