X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=7650b1427e57ed7b3ebe23ba7195f8919c26597d;hb=a8f418d417f4dc3f08318c579637d86e9c943b34;hp=a55c60c1864e5356d23197b74aac8477b896cb94;hpb=e575f2b30fea35519d48b64742a6dc1395d720b8;p=vlc diff --git a/Makefile.am b/Makefile.am index a55c60c186..7650b1427e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,19 +7,24 @@ # which have makefiles with distribution information. # - src (libvlc) is nedeed by modules, mozilla and bindings # - libs/* are needed by modules -BASE_SUBDIRS = po src bin modules share doc test +BASE_SUBDIRS = po compat src bin modules share doc test EXTRA_SUBDIRS = m4 extras/package/ipkg \ - libs/loader libs/srtp \ + libs/loader libs/srtp libs/unzip \ projects/mozilla projects/activex DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) -SUBDIRS = po src +SUBDIRS = po compat src if LOADER SUBDIRS += libs/loader endif if HAVE_LIBGCRYPT SUBDIRS += libs/srtp endif +if HAVE_ZLIB +if !HAVE_MINIZIP +SUBDIRS += libs/unzip +endif +endif if BUILD_VLC SUBDIRS += bin endif @@ -81,74 +86,55 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - ln -sf doc/ChangeLog-2008 "$@" + ln -sf doc/ChangeLog-2009 "$@" ############################################################################### # MacOS X project ############################################################################### EXTRA_DIST += \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Update.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ - extras/package/macosx/Resources/a52.icns \ - extras/package/macosx/Resources/aac.icns \ - extras/package/macosx/Resources/asf.icns \ - extras/package/macosx/Resources/asx.icns \ + extras/package/macosx/Resources/aiff.icns \ + extras/package/macosx/Resources/audio.icns \ extras/package/macosx/Resources/avi.icns \ - extras/package/macosx/Resources/bin.icns \ - extras/package/macosx/Resources/cue.icns \ - extras/package/macosx/Resources/dat.icns \ - extras/package/macosx/Resources/divx.icns \ - extras/package/macosx/Resources/dv.icns \ + extras/package/macosx/Resources/flv.icns \ extras/package/macosx/Resources/generic.icns \ - extras/package/macosx/Resources/m3u.icns \ + extras/package/macosx/Resources/m4a.icns \ + extras/package/macosx/Resources/m4v.icns \ + extras/package/macosx/Resources/mkv.icns \ extras/package/macosx/Resources/mov.icns \ + extras/package/macosx/Resources/movie.icns \ extras/package/macosx/Resources/mp3.icns \ - extras/package/macosx/Resources/mp4.icns \ extras/package/macosx/Resources/mpeg.icns \ - extras/package/macosx/Resources/mpeg1.icns \ - extras/package/macosx/Resources/mpeg2.icns \ - extras/package/macosx/Resources/mpeg4.icns \ - extras/package/macosx/Resources/mpg.icns \ extras/package/macosx/Resources/ogg.icns \ - extras/package/macosx/Resources/ogm.icns \ - extras/package/macosx/Resources/pls.icns \ - extras/package/macosx/Resources/srt.icns \ - extras/package/macosx/Resources/sub.icns \ - extras/package/macosx/Resources/vlc.icns \ + extras/package/macosx/Resources/playlist.icns \ + extras/package/macosx/Resources/rm.icns \ + extras/package/macosx/Resources/subtitle.icns \ extras/package/macosx/Resources/vob.icns \ + extras/package/macosx/Resources/wav.icns \ + extras/package/macosx/Resources/vlc.icns \ extras/package/macosx/Resources/wma.icns \ extras/package/macosx/Resources/wmv.icns \ extras/package/macosx/Resources/pause.png \ @@ -246,6 +232,28 @@ EXTRA_DIST += \ extras/package/macosx/Resources/skip_previous_graphite.png \ extras/package/macosx/Resources/stop_graphite.png \ extras/package/macosx/Resources/volumeslider_graphite.png \ + extras/package/macosx/Resources/backward_big_down.png \ + extras/package/macosx/Resources/backward_big.png \ + extras/package/macosx/Resources/eq_sm.pdf \ + extras/package/macosx/Resources/forward_big_down.png \ + extras/package/macosx/Resources/forward_big.png \ + extras/package/macosx/Resources/fs_sm.pdf \ + extras/package/macosx/Resources/list_sm.pdf \ + extras/package/macosx/Resources/next_sm.pdf \ + extras/package/macosx/Resources/pause_big_down.png \ + extras/package/macosx/Resources/pause_big.png \ + extras/package/macosx/Resources/play_big_down.png \ + extras/package/macosx/Resources/play_big.png \ + extras/package/macosx/Resources/prev_sm.pdf \ + extras/package/macosx/Resources/sidebarAdd.png \ + extras/package/macosx/Resources/sidebarRepeat.png \ + extras/package/macosx/Resources/sidebarRepeatOn.png \ + extras/package/macosx/Resources/sidebarRepeatOneOn.png \ + extras/package/macosx/Resources/sidebarResizeWidget.png \ + extras/package/macosx/Resources/sidebarShuffle.png \ + extras/package/macosx/Resources/sidebarShuffleOn.png \ + extras/package/macosx/Resources/sidebarStatusAreaBackground.png \ + extras/package/macosx/Resources/stop_sm.pdf \ extras/package/macosx/Resources/noart.png \ extras/package/macosx/Resources/spref_cone_Audio_64.png \ extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \ @@ -267,7 +275,6 @@ EXTRA_DIST += \ extras/package/macosx/plugin/InstallerInfo.plist.in \ extras/package/macosx/plugin/InstallerDescription.plist \ extras/package/macosx/plugin/pbdevelopment.plist \ - extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -309,12 +316,16 @@ vlc-config.in: vlc-config.in.in touch $@ CLEANFILES = $(BUILT_SOURCES_clean) -DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile +MAINTAINERCLEANFILES = ChangeLog # Shortcut for developpers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch -libvlc: +libcompat: + cd compat && $(MAKE) $(AM_MAKEFLAGS) + +libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la core: libvlc @@ -368,37 +379,33 @@ dist_noinst_SCRIPTS += make-alias MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ -cvlc: make-alias +cvlc: make-alias Makefile $(MKALIAS) dummy -rvlc: make-alias +rvlc: make-alias Makefile $(MKALIAS) rc -svlc: make-alias +svlc: make-alias Makefile $(MKALIAS) skins2 -wxvlc: make-alias +wxvlc: make-alias Makefile $(MKALIAS) wx -qvlc: make-alias +qvlc: make-alias Makefile $(MKALIAS) qt4 -nvlc: make-alias +nvlc: make-alias Makefile $(MKALIAS) ncurses -mvlc: make-alias +mvlc: make-alias Makefile $(MKALIAS) maemo if BUILD_VLC noinst_SCRIPTS += vlc$(EXEEXT) endif -vlc$(EXEEXT): Makefile.am - rm -f -- vlc vlc.tmp - echo '#! /bin/sh' > vlc.tmp - echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp - chmod +x vlc.tmp - mv -f -- vlc.tmp vlc +vlc$(EXEEXT): + ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN if BUILD_VLC @@ -466,8 +473,8 @@ VLC-release.app: vlc bookmarks.m \ update.h \ update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -526,13 +533,9 @@ VLC-release.app: vlc $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts - $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done @@ -542,15 +545,6 @@ VLC-release.app: vlc for i in $(srcdir)/share/http/js/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ done - for i in $(srcdir)/share/http/old/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/admin/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/vlm/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ - done for i in $(srcdir)/share/http/images/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ done @@ -569,13 +563,12 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete; - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete; + find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete; find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; # This is just for development purposes. -# The resulting VLC.app will only in this tree. +# The resulting VLC.app will only run in this tree. VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib (cd src && make install) rm -Rf $(top_builddir)/tmp @@ -633,8 +626,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib bookmarks.m \ update.h \ update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -680,6 +673,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ## Win ## ############################################################################ win32_destdir=$(top_builddir)/vlc-$(VERSION) +win32_debugdir=$(top_builddir)/symbols-$(VERSION) +npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT) +axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT) win32_lua_destdir=$(win32_destdir)/lua win32_http_destdir=$(win32_destdir)/http @@ -709,7 +705,7 @@ package-win-common: unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen" # Necessary icons - cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/ + cp $(srcdir)/share/vlc.ico $(win32_destdir)/ # Copy the locales mkdir -p $(win32_destdir)/locale @@ -726,7 +722,7 @@ package-win-common: if BUILD_MOZILLA mkdir -p "$(win32_destdir)/mozilla" cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ - cp $(top_builddir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/ + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/ endif # ActiveX plugin @@ -737,7 +733,7 @@ if BUILD_ACTIVEX unix2dos $(win32_destdir)/activex/* cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/ - cp $(top_builddir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/ + cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/ endif # Rebase all those DLLs to speed up loading (need cygwin rebase) @@ -818,9 +814,6 @@ if BUILD_HTTPD mkdir -p "$(win32_http_destdir)/requests" mkdir -p "$(win32_http_destdir)/js" mkdir -p "$(win32_http_destdir)/dialogs" - mkdir -p "$(win32_http_destdir)/old" - mkdir -p "$(win32_http_destdir)/old/vlm" - mkdir -p "$(win32_http_destdir)/old/admin" cp $(srcdir)/share/http/*.html $(win32_http_destdir)/ unix2dos $(win32_http_destdir)/*.html cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/ @@ -840,16 +833,6 @@ if BUILD_HTTPD cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt unix2dos $(win32_http_destdir)/requests/readme.txt - cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/ - unix2dos $(win32_http_destdir)/old/*.html - cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/ - unix2dos $(win32_http_destdir)/old/vlm/*.html - cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/ - unix2dos $(win32_http_destdir)/old/admin/*.html - cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/ endif if BUILD_SKINS @@ -861,15 +844,17 @@ if BUILD_SKINS for i in $(top_builddir)/share/skins2/*.*; do \ cp -- "$$i" $(win32_destdir)/skins/ || true ; \ done + cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ; + cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ; endif if BUILD_OSDMENU #OSD Menu mkdir -p "$(win32_destdir)/osdmenu" cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" - for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ + for dir in default default/selected default/selection default/volume ;do \ mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \ + for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \ cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \ done; \ done @@ -893,19 +878,42 @@ endif #strip exe and main dll package-win-common-strip: package-win32-base-debug + @if test -e "$(win32_debugdir)"; then \ + echo "Error: please remove $(win32_debugdir), it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(win32_debugdir)"; \ + fi for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi; done + if BUILD_MOZILLA - $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)" + $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg" + $(OBJCOPY) --strip-debug "$(npvlc)" + $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)" + mv "$(npvlc).dbg" "$(win32_debugdir)" endif if BUILD_ACTIVEX - $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)" + $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg" + $(OBJCOPY) --strip-debug "$(axvlc)" + $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)" + mv "$(axvlc).dbg" "$(win32_debugdir)" endif #strip all plugins dll package-win32-base: package-win-common-strip for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi ; done package-win32-base-exe: package-win32-base # Create package @@ -1038,12 +1046,13 @@ package-macosx: VLC-release.app ChangeLog else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ fi - cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ - cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ - cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ - cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ - cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/ # Place a link to the application folder ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications @@ -1081,7 +1090,7 @@ package-macosx: VLC-release.app ChangeLog # Note: We can't directly create a read only dmg as we do the bless stuff echo "Make the disk image read-only" mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" - hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" + hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg" rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" # We are done @@ -1134,8 +1143,8 @@ if BUILD_MOZILLA fi; \ $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \ - -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true + -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \ + -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true rm -rf "$(top_builddir)/macosx-plugin-instdata/" # Create disk image @@ -1144,7 +1153,7 @@ if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/" mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/" hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \ - "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \ + "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \ -scrub -imagekey zlib-level=9 echo "Disk image creation completed:" rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" @@ -1180,37 +1189,12 @@ package-translations: ############################################################################### # PO translation files update -# Generate po/POTFILES.in which lists all the files containing translatable -# strings. Find all source files and remove the generated files ############################################################################### .PHONY: update-po update-po: - rm -f $(top_srcdir)/po/POTFILES.in - { \ - cd $(top_srcdir) && \ - echo "# automatically created by make update-po" ; \ - echo "" ; \ - echo "# main sources" ; \ - find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \ - | sort ; \ - echo "" ; \ - echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \ - | grep -v '\(\.moc\.\|gui/gtk2/\)' \ - | grep -vE 'qt4/ui/.*.h' \ - | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ - | grep -v 'gui/opie' \ - | grep -v 'wxwidgets' \ - | grep -v 'mux/rtp/' \ - | grep -v 'demux/rtpxiph.c' \ - | sort ; \ - } > $(top_srcdir)/po/POTFILES.in - rm -f $(top_srcdir)/po/vlc.pot cd po && $(MAKE) POTFILES vlc.pot update-po -#cd po && $(MAKE) update-po ############################################################################### # Enforce Mac OS X deployment target environment variable