* toolbox: Export LC_ALL=C to avoid future cluttering of POTFILES.in.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8e9cd65fff85f8e46e75f6d0fd6823d890fbd51d..41237077267f00d801b1d9d4d24fa2fdcac4a510 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,11 @@ NULL =
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
-SUBDIRS = intl modules . mozilla share po m4
+#  - intl should come before modules and . because all the code uses gettext
+#  - modules should come before . because vlc needs the builtins
+#  - . should come before mozilla because the plugin needs libvlc_pic.a
+#  - po should come before . because VLC.app needs the pofiles
+SUBDIRS = intl modules po . mozilla share m4
 DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
 
 EXTRA_DIST = \
@@ -404,8 +408,10 @@ VLC.app: vlc
            "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
-       $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
-         $(srcdir)/VLC.app/Contents/MacOS/share
+       $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http
+       $(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http
+       $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin
+       $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http/admin
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -464,8 +470,6 @@ package-win32:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
        $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
-       cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
-       unix2dos "$(srcdir)/tmp/INSTALL.txt"
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
          unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
@@ -479,9 +483,6 @@ package-win32:
        for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-       mkdir -p "$(srcdir)/tmp/share"
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
-
        mkdir $(srcdir)/tmp/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
@@ -497,6 +498,11 @@ package-win32:
          cp $$i $(srcdir)/tmp/skins/ || true ; \
        done
 
+       mkdir -p "$(srcdir)/tmp/http/admin"
+       cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ;
+       cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ;
+       cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ;
+
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
 # Clean up
@@ -525,7 +531,6 @@ package-beos:
          cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
        mkdir -p $(srcdir)/tmp/vlc/share
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
 
 # Create package with debug symbols
        mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*