]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Overlay - Added text demonstrations
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 939a151affc8400db817f8391c4c8b266b59fb3c..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 ... )
@@ -442,9 +481,6 @@ VLC-release.app: vlc
        done ; \
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests
        $(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts
@@ -457,15 +493,6 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/lua/http/js/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/lua/http/old/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/`basename $${i}` ; \
-       done
-       for i in $(srcdir)/share/lua/http/old/admin/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin/`basename $${i}` ; \
-       done
-       for i in $(srcdir)/share/lua/http/old/vlm/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm/`basename $${i}` ; \
-       done
        for i in $(srcdir)/share/lua/http/images/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \
        done
@@ -659,9 +686,6 @@ package-win-common:
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/dialogs"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/admin"
        cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.html ;
        cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
@@ -681,17 +705,6 @@ package-win-common:
        cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
 
-       cp $(srcdir)/share/lua/http/old/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/*.html ;
-       cp $(srcdir)/share/lua/http/old/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
-       cp $(srcdir)/share/lua/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
-       cp $(srcdir)/share/lua/http/old/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
-       cp $(srcdir)/share/lua/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/*.html ;
-       cp $(srcdir)/share/lua/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/*.html ;
-       cp $(srcdir)/share/lua/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
-
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
@@ -762,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 \
@@ -771,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 ; \
@@ -779,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 \
Unnamed repository; edit this file 'description' to name the repository.