Adds support for Apple's remote (only handles Play/Pause at the moment).

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f1fb930d86f3473a649c7d0c900edfa73f5a767..10159624a82c8c5b13d291ec1c4a453819578990 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ NULL =
 #  - 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)
@@ -164,6 +164,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)
 
 ###############################################################################
@@ -343,6 +348,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 +488,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 \
@@ -659,7 +668,6 @@ endif
 
        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/ ;
@@ -702,7 +710,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 \
@@ -847,14 +855,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 \
+         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \
          -scrub -imagekey zlib-level=9 ;
-       echo; echo "Disk image creation completed:" ;
+       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"; \