Contribs - libpng: Updates to 1.2.20. No more MMX optimisations, a few bugs are fixed.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 38db434c600af1ed5716cec4e7816986410100ef..a14239631a5b62b5bd9d56cfef7269fc6b80a8f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,7 +249,7 @@ nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
 
 vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -no-install
 if !HAVE_PLUGINS
 vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
 endif
@@ -260,7 +260,7 @@ LIBVLC = src/$(LIB_libvlc)
 
 #To get some nice output
 nice:
-               $(top_builddir)/compile
+       $(top_builddir)/compile
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
@@ -304,7 +304,7 @@ vlc-bundle: vlc
            cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
          done ; \
        fi
-       for i in $(ALL_LINGUAS); do \
+       cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
          cp "$(top_builddir)/po/$$i.gmo" \
            "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
@@ -407,6 +407,11 @@ VLC-release.app: vlc
                   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
                   $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
+       $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+                  @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
        install_name_tool -change /usr/local/lib/libvlc.1.dylib \
                   @executable_path/lib/libvlc.dylib \
               $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
@@ -464,7 +469,7 @@ VLC-release.app: vlc
        done ; \
        $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
-       for i in $(ALL_LINGUAS); do \
+       cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
          cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
@@ -553,6 +558,11 @@ VLC.app: vlc
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
                   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
+       $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+                  @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
        install_name_tool -change /usr/local/lib/libvlc.1.dylib \
                   @executable_path/lib/libvlc.dylib \
               $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -575,7 +585,7 @@ VLC.app: vlc
        fi
        ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
-       for i in $(ALL_LINGUAS); do \
+       cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
          ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -624,7 +634,7 @@ package-win-common:
          unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
 
        mkdir $(top_builddir)/vlc-${VERSION}/locale
-       for i in $(ALL_LINGUAS); do \
+       cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
          cp "$(srcdir)/po/$${i}.gmo" \
            "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
@@ -729,15 +739,18 @@ package-win32-base-debug: package-win-common
 
        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;do \
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
                mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
                for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
                         cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
                done; \
        done
        unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
-       sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
-       sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
+       for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \
+               if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \
+               if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
+               rm -f $$file.tmp; \
+       done
 
 
 package-win32-base: package-win32-base-debug package-win-common-strip
@@ -750,6 +763,8 @@ package-win32-base-exe: package-win32-base
            MAKENSIS="makensis -DVERSION=${VERSION}"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
            MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
+       elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
+           MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
        elif wine --version >dev/null 2>&1; then \
            MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
        else \
@@ -964,7 +979,7 @@ package-translations:
          echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
        fi
 # Copy translations
-       for i in $(ALL_LINGUAS); do \
+       cat $(top_srcdir)/po/LINGUAS | while read i; do \
          cp "$(srcdir)/po/$${i}.po" \
            "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
            || true ; \
@@ -986,6 +1001,8 @@ package-translations:
 
 ###############################################################################
 # PO translation files update
+# Generate po/POTFILES.in which lists all the files containing translatable
+# strings. Find all source files and remove the generated files
 ###############################################################################
 .PHONY: update-po
 
@@ -1003,7 +1020,7 @@ update-po:
          echo "# modules" ; \
          find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
            | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-           | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
+           | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot