X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e946adec013ff2efe168e444f8e8cfecf5dd271a;hb=6f2a64ee29499b3768efabe5ca9dd611b0938cd4;hp=a7c1f77f1a4564cf12f6a9f02032cfab8b6f829a;hpb=21bd7be900bf2c4bb4b8001999522f34c10559c1;p=vlc

diff --git a/Makefile.am b/Makefile.am
index a7c1f77f1a..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 \
@@ -481,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 \
@@ -701,7 +708,7 @@ 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 \
@@ -854,6 +861,31 @@ package-macosx:
 # 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"; \