X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c00082a9a59b5bd43b0594cc82ebe43743a813a8;hb=3efe5e8aec56dd2397d2d3def1ce623362181503;hp=91eae3e552b8abe60a6f70de59d85a9dc355a148;hpb=8d11ad3be8abebbb2757d88b9b7e402b301a0a6b;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 91eae3e552..c00082a9a5 100644
--- 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"
@@ -883,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