X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=a351c84a6ec094c603e6df0851ffd8a7d781f6ad;hb=39670df97892b3ef4be6edd28e39826804f51cff;hp=085a279854e00bb49b013568b7499337ecbd45fd;hpb=669f25d7debaa52d21d7b1588410f4a7e99e011b;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 085a279854..a351c84a6e 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
 
 
 ###############################################################################
@@ -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 \
@@ -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 \
@@ -844,6 +843,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 +873,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 +1139,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