Sync NEWS

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f45388795fc4286092810ea395de950f2d853054..91b8cf0da2121e6dc170324b897e560ee543d956 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,7 +453,6 @@ VLC-release.app: vlc
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -566,6 +565,8 @@ 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 -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
@@ -619,7 +620,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -752,6 +752,9 @@ package-win32-base-debug: package-win-common
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
+# Contrib *.dll's
+       cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
        mkdir -p "$(win32_lua_destdir)/http/images"
@@ -850,9 +853,7 @@ if BUILD_SKINS
        done
        for i in $(top_builddir)/share/skins2/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/ || true ; \
-       done \
-       cp -v share/skins2/default.vlt $(win32_destdir)/skins/ || true ;
-
+       done
 endif
 
 if BUILD_OSDMENU
@@ -885,9 +886,8 @@ endif
 
 #strip exe and main dll
 package-win-common-strip: package-win32-base-debug
-       $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
-       $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
-       $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+       for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
 if BUILD_MOZILLA
        $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif
@@ -1118,7 +1118,14 @@ if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/macosx-plugin-instdata"
        cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
        rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
-       PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+       export PACKAGEMAKER=
+       if test -x /Developer/Tools/packagemaker; then \
+          export PACKAGEMAKER=/Developer/Tools/packagemaker; \
+       fi; \
+       if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
+          export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
+       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