Remove lua/http/old from Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 939a151affc8400db817f8391c4c8b266b59fb3c..58acb89301f73baec0196235b675dc2635fd540f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -442,9 +442,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 +454,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 +647,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 +666,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"

diff --git a/share/Makefile.am b/share/Makefile.am
index df53119ece64005c175a45f8343c0eda664b3947..f6a52bcd142fdab7e2b3a2c2943f9140958cea3f 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -328,21 +328,6 @@ DIST_http_lua = \
        lua/http/js/mosaic.js \
        lua/http/js/vlm.js \
        lua/http/mosaic.html \
-       lua/http/old/.hosts \
-       lua/http/old/admin/.access \
-       lua/http/old/admin/browse.html \
-       lua/http/old/admin/dboxfiles.html \
-       lua/http/old/admin/index.html \
-       lua/http/old/cone_minus.png \
-       lua/http/old/cone_plus.png \
-       lua/http/old/index.html \
-       lua/http/old/info.html \
-       lua/http/old/style.css \
-       lua/http/old/vlm/edit.html \
-       lua/http/old/vlm/index.html \
-       lua/http/old/vlm/new.html \
-       lua/http/old/vlm/show.html \
-       lua/http/old/webcam.html \
        lua/http/requests/browse.xml \
        lua/http/requests/playlist.xml \
        lua/http/requests/status.xml \