X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e946adec013ff2efe168e444f8e8cfecf5dd271a;hb=aa0e6bd7f82b79d41c9aad41e65efb9d42e84672;hp=ad3a6dcaa812d987597a53ff35a59b19162057ca;hpb=bb48220f9b63bc53df91764371a0482544f47159;p=vlc

diff --git a/Makefile.am b/Makefile.am
index ad3a6dcaa8..e946adec01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,11 @@ NULL =
 # which have makefiles with distribution information.
 #  - intl should come before modules and . because all the code uses gettext
 #  - modules should come before . because vlc needs the builtins
-#  - . should come before mozilla/bindings because the plugin needs libvlc_pic.a
+#  - . should come before mozilla/bindings because the plugin needs libvlc.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
 SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
-DIST_SUBDIRS = $(SUBDIRS) debian ipkg
+DIST_SUBDIRS = $(SUBDIRS)  ipkg
 
 EXTRA_DIST = \
 	HACKING \
@@ -28,10 +28,10 @@ EXTRA_DIST = \
 	vlc-config.in.in \
 	vlc.spec \
 	vlc.spec.mdk \
-	vlc.win32.nsi \
+	vlc.win32.nsi.in \
 	$(NULL)
 
-BUILT_SOURCES_distclean = vlc-config compile
+BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
 BUILT_SOURCES_clean = macosx-sdk
 
 BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
@@ -47,10 +47,6 @@ endif
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
-# XXX: these flags could be set in configure.ac, but we set them here
-# because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = dist-bzip2
-
 ###############################################################################
 # MacOS X project
 ###############################################################################
@@ -164,6 +160,11 @@ EXTRA_DIST += \
 	extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
 	extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
 	extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
+	extras/MacOSX/plugin/Info.plist \
+	extras/MacOSX/plugin/InstallerInfo.plist \
+	extras/MacOSX/plugin/InstallerDescription.plist \
+	extras/MacOSX/plugin/pbdevelopment.plist \
+	extras/MacOSX/plugin/English.lproj/InfoPlist.strings \
 	$(NULL)
 
 ###############################################################################
@@ -210,9 +211,11 @@ bin_SCRIPTS = vlc-config
 vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
 	$(SHELL) ./config.status --file=$@
 	chmod 0755 $@
+	touch $@
 
 vlc-config.in: vlc-config.in.in
 	./config.status --recheck
+	touch $@
 
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
@@ -343,6 +346,8 @@ VLC-release.app: vlc
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
+	    AppleRemote.h \
+	    AppleRemote.m \
 	    about.h \
 	    about.m \
 	    applescript.h \
@@ -451,6 +456,7 @@ VLC-release.app: vlc
 	for i in $(srcdir)/share/http/requests/*.* ; do \
 	  $(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
 	for i in $(ALL_LINGUAS); do \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -480,6 +486,8 @@ VLC.app: vlc
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
+	    AppleRemote.h \
+	    AppleRemote.m \
 	    about.h \
 	    about.m \
 	    applescript.h \
@@ -618,10 +626,8 @@ package-win-common:
 # Copy relevant files
 	cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
 	cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-	$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
 if BUILD_SHARED
 	cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-	$(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
 endif
 
 	for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
@@ -655,10 +661,11 @@ endif
 	cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
 	cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
+	cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
 
 	cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
-	cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
@@ -671,7 +678,6 @@ endif
 if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 	cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-	$(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
 	cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
@@ -682,16 +688,27 @@ if BUILD_ACTIVEX
 	unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
 	cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
-	$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
 	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
 		find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
 	fi
 
+package-win-common-strip:
+	$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
+if BUILD_SHARED
+	$(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
+endif
+if BUILD_MOZILLA
+	$(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+endif
+if BUILD_ACTIVEX
+	$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+
 package-win32-base-debug: package-win-common
 # Copy relevant files
-	cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
+	cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
@@ -721,11 +738,10 @@ package-win32-base-debug: package-win-common
 	sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
 
-package-win32-base: package-win32-base-debug
+package-win32-base: package-win32-base-debug package-win-common-strip
 	for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
 	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-
 package-win32-base-exe: package-win32-base
 # Create package
 	if makensis -VERSION >/dev/null 2>&1; then \
@@ -750,6 +766,10 @@ package-win32-base-zip: package-win32-base
 # Create package 
 	zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
 
+package-win32-base-7zip: package-win32-base
+# Create package 
+	7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-${VERSION}-win32.7z vlc-${VERSION}
+
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
@@ -762,11 +782,15 @@ package-win32-zip: package-win32-base-zip
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-win32-7zip: package-win32-base-7zip
+# Clean up
+	rm -Rf $(top_builddir)/vlc-${VERSION}
+
 package-win32: package-win32-base-exe package-win32-base-zip
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-wince-base: package-win-common
+package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
 # Create package 
@@ -829,13 +853,39 @@ package-macosx:
 	echo "Creating disk image" ;
 	rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
 	hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
-	  "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ;
-	echo; echo "Disk image creation completed:" ;
+	  "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \
+	  -scrub -imagekey zlib-level=9 ;
+	echo "Disk image creation completed:" ;
 	ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
 
 # Clean up
 	rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
+package-macosx-plugin:
+if BUILD_MOZILLA
+# Create Installer
+	rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
+	mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+	cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+	rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
+	/Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+	-f "$(top_builddir)/macosx-plugin-instdata" \
+	-i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
+	-d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+	rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+
+# Create disk image 
+	rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true
+	rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true
+	mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/"
+	mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/"
+	hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \
+	  "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \
+	  -scrub -imagekey zlib-level=9 ;
+	echo "Disk image creation completed:"
+	rm -rf "$(top_builddir)/vlc-plugin-${VERSION}"
+endif
+
 package-translations:
 	@if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
 	  echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \