macosx: adapt to new stereo-mode text

[vlc] / extras / package / macosx / package.mak

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index c8c760d1448b19b36a48263dff1370b22c2512f4..b604ab9cd5b1b2a13e15dcff8a261446e46c19d7 100644 (file)
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -6,27 +6,28 @@ endif
 endif
 
 # This is just for development purposes.
-# The resulting VLC.app will only run in this tree.
-VLC.app: VLC-tmp
+# The resulting VLC-dev.app will only run in this tree.
+VLC-dev.app: VLC-tmp
        rm -Rf $@
        cp -R VLC-tmp $@
        $(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc $@/Contents/MacOS/VLC
        $(LN_S) -f ../../../modules $@/Contents/MacOS/plugins
 
-# VLC-release.app for packaging and giving it to your friends
+# VLC.app for packaging and giving it to your friends
 # use package-macosx to get a nice dmg
-VLC-release.app: VLC-tmp
+VLC.app: VLC-tmp
        rm -Rf $@
        cp -R VLC-tmp $@
-       PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
        find $@ -type d -exec chmod ugo+rx '{}' \;
        find $@ -type f -exec chmod ugo+r '{}' \;
        rm -Rf $@/Contents/Frameworks/BGHUDAppKit.framework/Resources/
 
 
 VLC-tmp: vlc
-       $(AM_V_GEN)(cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
-       (cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd))
+       $(AM_V_GEN)for i in src lib share; do \
+               (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
+       done
        rm -Rf "$(top_builddir)/tmp" "$@"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
@@ -46,7 +47,9 @@ VLC-tmp: vlc
        cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
        mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
        mkdir -p $@/Contents/MacOS/share/locale/
-       cp -r $(srcdir)/share/lua $@/Contents/MacOS/share/
+       cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
+       mkdir -p $@/Contents/MacOS/include/
+       cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
        $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          $(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
@@ -57,14 +60,12 @@ VLC-tmp: vlc
        done
        printf "APPLVLC#" >| $@/Contents/PkgInfo
 
-package-macosx: VLC-release.app
+package-macosx: VLC.app
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/Goodies/"
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
+       cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"
        cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_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
-       mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/
-       cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
        $(LN_S) -f /Applications $(top_builddir)/vlc-$(VERSION)/
        rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
        hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -scrub -format UDRW
@@ -80,21 +81,15 @@ package-macosx: VLC-release.app
        rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
        rm -rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-zip: VLC-release.app
+package-macosx-zip: VLC.app
        mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
-       cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
-       cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS extras/package/macosx/Delete_Preferences.app/ \
-               $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
+       cp -R $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)/VLC.app
+       cd $(srcdir); cp -R AUTHORS COPYING README THANKS NEWS $(abs_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
        zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
        rm -rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-framework-zip:
-       mkdir -p $(top_builddir)/vlckit-$(VERSION)/Goodies/
-       cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework $(top_builddir)/vlckit-$(VERSION)/
-       cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlckit-$(VERSION)/Goodies/
-       zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
-
 package-translations:
        mkdir -p "$(srcdir)/vlc-translations-$(VERSION)"
        for i in `cat "$(top_srcdir)/po/LINGUAS"`; do \
@@ -114,4 +109,4 @@ package-translations:
        $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
          | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
 
-.PHONY: package-macosx package-macosx-zip package-macosx-framework-zip package-translations
+.PHONY: package-macosx package-macosx-zip package-translations