Try to close ticket '#1775' (Qt intf startup size is too big)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2548f51a5d12a7159051c44aca44a88e4156ed50..c69649e700321800b511da811dc58fdc6ebdba0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,10 @@ EXTRA_DIST = \
        extras/package/rpm/vlc.fedora.spec \
        extras/package/rpm/vlc.mandriva.spec \
        extras/package/rpm/vlc.altlinux.spec \
-       extras/package/win32/vlc.win32.nsi.in
+       extras/package/win32/vlc.win32.nsi.in \
+       extras/package/win32/languages/declaration.nsh \
+       extras/package/win32/languages/english.nsh \
+       extras/package/win32/languages/french.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
@@ -59,6 +62,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-dbus \
        --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+       --disable-live555 \
        --disable-fribidi --disable-glx
 
 ACLOCAL_AMFLAGS = -I m4
@@ -312,7 +316,10 @@ libvlc:
 core:
        cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
-.PHONY: libvlc core
+doc:
+       cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
+
+.PHONY: libvlc core doc
 
 #To get some nice output
 nice:
@@ -403,9 +410,10 @@ VLC-release.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git-describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+       cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -468,7 +476,7 @@ 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
+       PRODUCT="VLC-release.app" ACTION="release-makefile" 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/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}` ; \
@@ -556,7 +564,7 @@ VLC-release.app: vlc
 
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
-VLC.app: vlc 
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
        (cd src && make install)
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
@@ -564,9 +572,10 @@ VLC.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git-describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+       cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -627,18 +636,15 @@ VLC.app: vlc
            cd ../../../../ && \
            cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app
-       rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
        chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
-       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
-       find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
-         if test -n "$$i" ; \
-          then ln -sfn "`pwd`/$$i" \
-                                  "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
-         fi ; done && \
-       ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
+       ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
+       install -d $(top_builddir)/VLC.app/Contents/MacOS/share
+       for i in `ls $(srcdir)/share`; do \
+          ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \
+       done
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
@@ -726,6 +732,8 @@ package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
        cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+       mkdir "$(win32_destdir)/languages"
+       cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
 
 # Plugins
        mkdir -p "$(win32_destdir)/plugins"
@@ -878,7 +886,7 @@ package-win32-base: package-win-common-strip
 
 package-win32-base-exe: package-win32-base
 # Create package
-    rm -Rf $(win32_destdir)/sdk
+       rm -Rf $(win32_destdir)/sdk
        if makensis -VERSION >/dev/null 2>&1; then \
            MAKENSIS="makensis"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
@@ -965,7 +973,7 @@ package-beos:
 # Clean up
        rm -Rf $(srcdir)/tmp
 
-package-macosx:
+package-macosx: VLC-release.app
 # Check that the temporary location isn't in the way
        @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
          rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
@@ -1033,7 +1041,7 @@ package-macosx:
 # Clean up
        rm -Rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-zip:
+package-macosx-zip: VLC-release.app
        rm -Rf $(top_builddir)/vlc-$(VERSION)
        mkdir -p $(top_builddir)/vlc-$(VERSION)
        cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
@@ -1044,7 +1052,7 @@ package-macosx-zip:
        cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
             $(top_builddir)/vlc-$(VERSION)/Goodies
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
-          $(top_builddir)/vlc-$(VERSION)
+          $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
        zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
        rm -Rf $(top_builddir)/vlc-$(VERSION)
 
@@ -1141,9 +1149,6 @@ update-po:
            | grep -v 'mux/rtp/' \
            | grep -v 'demux/rtpxiph.c' \
            | sort ; \
-         echo "#bindings" ; \
-            find bindings -name '*.[chm]' -o -name '*.[ch]pp' \
-            |sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot
        cd po && $(MAKE) POTFILES vlc.pot update-po