X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=d70a599d565e3276aac310903db876361cb911d7;hb=88ff21f116e5a39e0261a984e99e9f1bc47aec9e;hp=62b768ba70122cdc68573f87947116d6ba8fc394;hpb=aa39d52bc98d8060311e0e77fd83b0f447b90386;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 62b768ba70..d70a599d56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -424,55 +424,43 @@ VLC-release.app: vlc
 	  for i in $(srcdir)/src/.libs/*.dylib ; do \
 	    $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
 	  done ;
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
-	for i in $(srcdir)/share/luaplaylist/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
-	for i in $(srcdir)/share/luameta/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta
+	for i in $(srcdir)/share/lua/meta/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf
-	for i in $(srcdir)/share/luaintf/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf
+	for i in $(srcdir)/share/lua/intf/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules
-	for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules
+	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
-	$(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
-	for i in $(srcdir)/share/http-lua/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
+	$(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/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
+	for i in $(srcdir)/share/lua/http/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/dialogs/* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/dialogs/* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/js/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
+	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/http-lua/old/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
+	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
-	for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/requests/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http-lua/images/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http-lua/requests/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
-	done
-	$(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
+	$(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
@@ -655,42 +643,28 @@ package-win-common:
             || true ; \
 	done
 
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin"
-	cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ;
-	cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ;
-	cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ;
-	cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ;
-	cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ;
-	cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ;
-	cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/
-	cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ;
-	cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-
-	cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ;
-	cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ;
-	cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ;
-	cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
+	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"
+	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/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/.hosts ;
+	cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.css ;
+	cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/lua/http/js/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/js/*.js ;
+	cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/* ;
+	cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/.hosts ;
+	cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/images/
+	cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/lua/http/requests/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
+	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 ;
 
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
@@ -762,8 +736,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 +747,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 +756,25 @@ package-win32-base-debug: package-win-common
 	  cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
 	done
 
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist
-	for i in $(srcdir)/share/luaplaylist/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \
+#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)/scripts/playlist/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta
-	for i in $(srcdir)/share/luameta/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta
+	for i in $(srcdir)/share/lua/meta/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf
-	for i in $(srcdir)/share/luaintf/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf
+	for i in $(srcdir)/share/lua/intf/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules
-	for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \
+	$(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)/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 \