]> git.sesse.net Git - vlc/blobdiff - Makefile.am
more VLM tests
[vlc] / Makefile.am
index 870250f3f57ccdf12d57f60ef246a7fd0f917521..1f1c63cda31cb68a930700392019071f88b25021 100644 (file)
@@ -38,7 +38,8 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 SUFFIXES = 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
-       --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
+       --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+       --disable-fribidi
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -49,6 +50,10 @@ AUTOMAKE_OPTIONS = \
        no-dist-gzip
 #      std-options
 
+ChangeLog: Makefile.am
+       rm -f -- "$@"
+       ln -sf doc/ChangeLog-2008 "$@"
+
 ###############################################################################
 # MacOS X project
 ###############################################################################
@@ -57,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 \
@@ -123,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 \
@@ -191,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 \
@@ -205,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 ... )
@@ -217,7 +261,6 @@ EXTRA_DIST += \
        extras/analyser/vlc.vim \
        extras/analyser/valgrind.suppressions \
        extras/buildsystem/make.pl \
-       extras/buildsystem/autotools/m4/autoconf260.m4 \
        extras/misc/mpris.py \
        extras/misc/mpris.glade
 
@@ -239,7 +282,7 @@ vlc-config.in: vlc-config.in.in
        touch $@
 
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
@@ -333,7 +376,8 @@ if HAVE_DARWIN
 if BUILD_VLC
 noinst_DATA = VLC.app
 endif
-# VLC-release.app is the old VLC.app target
+# VLC-release.app for packaging and giving it to your friends
+# use package-macosx to get a nice dmg
 VLC-release.app: vlc
        ( cd src && make install )
        rm -Rf "$(top_builddir)/tmp"
@@ -406,56 +450,56 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
-       $(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) $(top_builddir)/src/.libs/vlc \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
+       ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
+       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+         if test -n "$$i" ; \
+           then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+                          "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
+         fi ; done
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
+         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/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}` ; \
-       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}` ; \
-       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}` ; \
-       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}` ; \
+       $(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/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/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/old/vlm/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`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/images/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`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/requests/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`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
-       $(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
@@ -504,6 +548,8 @@ VLC-release.app: vlc
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
+# This is just for development purposes. 
+# The resulting VLC.app will only in this tree.
 VLC.app: vlc 
        ( cd src && make install )
        rm -Rf $(top_builddir)/tmp
@@ -636,42 +682,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"
@@ -743,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 \
@@ -752,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 ; \
@@ -760,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/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 \