]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Qt4 - A to B Loop implementation.
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 7b7874a0eb14b0ad58836ee1fc9f8778ae5f54f7..6c4fab748eef2b8f4d1c60dc3cc15c406335b89a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -433,6 +433,46 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/luameta/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`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}` ; \
+       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}` ; \
+       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
+       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}` ; \
+       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}` ; \
+       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) -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
@@ -626,7 +666,7 @@ package-win-common:
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
        cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/"
 
-       for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
+       for file in AUTHORS MAINTAINERS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
          unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
 
@@ -638,6 +678,43 @@ 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}/http/images"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
@@ -733,6 +810,14 @@ package-win32-base-debug: package-win-common
        for i in $(srcdir)/share/luameta/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`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}` ; \
+       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}` ; \
+       done ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
@@ -861,6 +946,10 @@ package-macosx:
        echo "Create package directory: vlc-${VERSION}/";
        mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
+# For now, export the framework for third parties, from here
+       (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
+       cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
+
 # Copy relevant files 
        @if test -e "$(top_builddir)/VLC-release.app/"; then \
          cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
@@ -1011,7 +1100,7 @@ update-po:
          echo "" ; \
          echo "# main sources" ; \
          find include src -name '*.[chm]' -o -name '*.[ch]pp' \
-           | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \
+           | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
            | sort ; \
          echo "" ; \
          echo "# modules" ; \
Unnamed repository; edit this file 'description' to name the repository.