X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=8208754344e8ba9e108fac8b9bea1ab12463eebf;hb=74915476a1f94a3b5635d09dab80d72d73c8dc80;hp=5effc14d23bbb4f453fa9f426ad6acc14a38342d;hpb=fc17d8754f12ed7d244f62e398840bcc45d64d6a;p=vlc diff --git a/Makefile.am b/Makefile.am index 5effc14d23..8208754344 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,22 +11,23 @@ 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 \ - install-win32 \ src/extras/COPYING \ toolbox \ vlc-config.in.in \ vlc.ebuild \ vlc.spec \ vlc.spec.mdk \ + vlc.win32.nsi \ $(NULL) BUILT_SOURCES = @@ -71,14 +72,13 @@ HEADERS_include = \ include/darwin_specific.h \ include/charset.h \ include/codecs.h \ - include/encoder.h \ include/ninput.h \ include/input_ext-dec.h \ include/input_ext-intf.h \ 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 \ @@ -86,17 +86,26 @@ HEADERS_include = \ include/mtime.h \ include/network.h \ include/os_specific.h \ + include/snapshot.h \ include/stream_control.h \ 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 \ @@ -174,17 +183,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 \ @@ -213,7 +237,7 @@ EXTRA_DIST += \ $(NULL) dist-hook: - mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild + cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc ############################################################################### @@ -251,8 +275,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) \ @@ -291,23 +317,32 @@ 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/access.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/video_widgets.c \ 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 \ @@ -316,7 +351,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 \ @@ -329,6 +367,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) @@ -424,8 +464,6 @@ VLC.app: vlc applescript.m \ controls.h \ controls.m \ - info.h \ - info.m \ intf.h \ intf.m \ macosx.m \ @@ -437,6 +475,10 @@ VLC.app: vlc output.m \ playlist.h \ playlist.m \ + playlistinfo.h \ + playlistinfo.m \ + prefs_widgets.h \ + prefs_widgets.m \ prefs.h \ prefs.m \ vout.h \ @@ -444,7 +486,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 @@ -457,13 +499,26 @@ 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/vlm + for i in $(srcdir)/share/http/vlm/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`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) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access $(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 ; \ @@ -512,32 +567,38 @@ remove_distdir_woody = \ # XXX: this rule is probably only useful to you if you have exactly # the same setup as me. Contact sam@zoy.org if you need to use it. # -# Check that tmp isn't in the way package-win32-base: +# Check that tmp isn't in the way @if test -e "$(srcdir)/vlc-${VERSION}"; then \ echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \ false; \ else \ echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \ fi -# Create installation script - cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi" + # Copy relevant files + cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/" cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" + cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/" $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" + @if test -n "$(UPX)"; then \ + $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ; + for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done mkdir -p "$(srcdir)/vlc-${VERSION}/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; then \ - $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "\ - $(srcdir)/vlc-${VERSION}/plugins/" ; \ + $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ + "$(srcdir)/vlc-${VERSION}/plugins/" ; \ fi ; done for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done + do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \ + if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \ + done mkdir $(srcdir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ @@ -554,22 +615,48 @@ 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 + for i in $(srcdir)/share/skins2/*.*; do \ + cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \ + done - mkdir -p "$(srcdir)/tmp/http/admin" + mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin" + mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm" 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/ ; + cp $(srcdir)/share/http/vlm/*.html \ + $(srcdir)/vlc-${VERSION}/http/vlm/ ; + + cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ; + + mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" +if BUILD_MOZILLA + cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; + $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + @if test $(UPX); then \ + $(UPX) -9 $(srcdir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); fi ; \ + 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 \ - -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi + -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi package-win32-base-zip: # Create package - zip -r vlc-${VERSION}-win32 vlc-${VERSION} + zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} package-win32-exe: package-win32-base package-win32-base-exe # Clean up @@ -587,45 +674,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 @@ -641,11 +721,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 "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 ###############################################################################