X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=fe7102e311f71549fe34c05917948991cdde9f41;hb=098dab901c1a17c869a52d0d4042d03f00a83d67;hp=085a279854e00bb49b013568b7499337ecbd45fd;hpb=669f25d7debaa52d21d7b1588410f4a7e99e011b;p=vlc diff --git a/Makefile.am b/Makefile.am index 085a279854..fe7102e311 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,9 +104,6 @@ EXTRA_DIST += \ 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/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.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/keyedobjects.nib \ @@ -116,7 +113,7 @@ EXTRA_DIST += \ 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/InfoPlist.strings \ + 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 \ @@ -258,11 +255,11 @@ EXTRA_DIST += \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ - extras/package/macosx/plugin/Info.plist \ - extras/package/macosx/plugin/InstallerInfo.plist \ + extras/package/macosx/plugin/Info.plist.in \ + 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 \ + 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 \ @@ -270,7 +267,7 @@ EXTRA_DIST += \ extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \ extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \ extras/package/macosx/README.MacOSX.rtf \ - extras/package/macosx/Info.plist + extras/package/macosx/Info.plist.in ############################################################################### @@ -340,9 +337,9 @@ vlc-bundle: vlc done ; \ fi cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ - "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ + "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif @@ -403,9 +400,12 @@ VLC-release.app: vlc rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app - for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -450,8 +450,6 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -542,9 +540,9 @@ VLC-release.app: vlc $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \ done $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ @@ -563,9 +561,12 @@ VLC.app: vlc rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app - for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -610,8 +611,6 @@ VLC.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -640,10 +639,10 @@ VLC.app: vlc "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done && \ ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ + ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ @@ -688,13 +687,15 @@ package-win-common: cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ # Copy the locales - mkdir -p $(top_builddir)/vlc-$(VERSION)/locale + mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \ + "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES/vlc.mo" \ || true ; \ done + mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale/qt4/ + cp $(QT4LOCALEDIR)/*.qm $(top_builddir)/vlc-$(VERSION)/share/locale/qt4/ || true # Mozilla plugin if BUILD_MOZILLA @@ -844,6 +845,16 @@ if BUILD_OSDMENU done endif +# SDK + mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk.tmp" + mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk" + d=$$(pwd) && \ + cd src && \ + make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp" + cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/ + find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir + rm -Rf vlc-$(VERSION)/sdk/bin + package-win-common-strip: package-win32-base-debug $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)" $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" @@ -864,7 +875,7 @@ package-win32-base-exe: package-win32-base if makensis -VERSION >/dev/null 2>&1; then \ MAKENSIS="makensis"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \ + MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \ elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \ elif wine --version >/dev/null 2>&1; then \ @@ -1130,7 +1141,13 @@ update-po: | 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 ; \ + echo "#bindings" ; \ + find bindings -name '*.[chm]' -o -name '*.[ch]pp' \ + |sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot cd po && $(MAKE) POTFILES vlc.pot update-po