Give credit to Soren Bog (avacore)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58acb89301f73baec0196235b675dc2635fd540f..1f1c63cda31cb68a930700392019071f88b25021 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \
@@ -128,7 +131,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/play_blue.png \
        extras/package/macosx/Resources/stop.png \
        extras/package/macosx/Resources/stop_blue.png \
-       extras/package/macosx/Resources/display.png \
+       extras/package/macosx/Resources/display_left.png \
+       extras/package/macosx/Resources/display_middle.png \
+       extras/package/macosx/Resources/display_right.png \
        extras/package/macosx/Resources/display_slider.png \
        extras/package/macosx/Resources/display_track.png \
        extras/package/macosx/Resources/equalizerdrawer_active.png \
@@ -196,6 +201,32 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \
        extras/package/macosx/Resources/fs_exit_fullscreen.png \
        extras/package/macosx/Resources/fs_background.png \
+       extras/package/macosx/Resources/add_embedded_graphite.png \
+       extras/package/macosx/Resources/equalizerdrawer_graphite.png \
+       extras/package/macosx/Resources/fullscreen_graphite.png \
+       extras/package/macosx/Resources/next_graphite.png \
+       extras/package/macosx/Resources/pause_embedded_graphite.png \
+       extras/package/macosx/Resources/pause_graphite.png \
+       extras/package/macosx/Resources/play_embedded_graphite.png \
+       extras/package/macosx/Resources/play_graphite.png \
+       extras/package/macosx/Resources/playlistdrawer_graphite.png \
+       extras/package/macosx/Resources/previous_graphite.png \
+       extras/package/macosx/Resources/repeat_embedded_graphite.png \
+       extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
+       extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_graphite.png \
+       extras/package/macosx/Resources/skip_previous_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_previous_graphite.png \
+       extras/package/macosx/Resources/stop_graphite.png \
+       extras/package/macosx/Resources/volumeslider_graphite.png \
+       extras/package/macosx/Resources/noart.png \
+       extras/package/macosx/Resources/spref_cone_Audio_64.png \
+       extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \
+       extras/package/macosx/Resources/spref_cone_Input_64.png \
+       extras/package/macosx/Resources/spref_cone_Interface_64.png \
+       extras/package/macosx/Resources/spref_cone_Subtitles_64.png \
+       extras/package/macosx/Resources/spref_cone_Video_64.png \
        extras/package/macosx/fullscreen_panel.svg \
        extras/package/macosx/ub.sh \
        extras/package/macosx/vlc.xcodeproj/project.pbxproj \
@@ -210,7 +241,15 @@ EXTRA_DIST += \
        extras/package/macosx/plugin/InstallerInfo.plist \
        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 \
+       extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
+       extras/package/macosx/eyetvplugin/Info.plist \
+       extras/package/macosx/eyetvplugin/eyetvplugin.c \
+       extras/package/macosx/eyetvplugin/eyetvplugin.h \
+       extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
+       extras/package/macosx/README.MacOSX.rtf
+
 
 ###############################################################################
 # Various utilities ( editor syntax files, D-Bus controller ... )
@@ -736,8 +775,10 @@ endif
 
 package-win32-base-debug: package-win-common
 # Copy relevant files
+# Script installer
        cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
 
+# Plugins
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
          if test -n "$$i" ; then \
@@ -745,6 +786,7 @@ package-win32-base-debug: package-win-common
             "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
+# Skins
        mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
@@ -753,23 +795,25 @@ package-win32-base-debug: package-win-common
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
        done
 
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
+#Lua Scripts
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/playlist/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta
        for i in $(srcdir)/share/lua/meta/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf
        for i in $(srcdir)/share/lua/intf/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules
        for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
        done ;
 
+#OSD Menu
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
        for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \