upnp intel: reverts [22521] to make it compile. The module should be rewritten to...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 070d80b89aa6d310e5dc0324cb26e93506661bd7..a3dc56ee1ace7e5c59f48fd873b0ed73c3218fb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,7 @@ vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
 nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
-vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(DATA_win32_rc)
 
 vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
@@ -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.
@@ -268,13 +268,10 @@ nice:
 libvlc:
        cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc
-       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
-src/$(LIB_libvlc): libvlc
-
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        @rm -f vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \
@@ -304,7 +301,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 ; \
@@ -469,7 +466,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 ; \
@@ -585,7 +582,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 ; \
@@ -634,7 +631,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" \
@@ -746,8 +743,11 @@ package-win32-base-debug: package-win-common
                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
@@ -760,7 +760,9 @@ 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 wine --version >dev/null 2>&1; then \
+       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 \
            echo 'Error: cannot locate makensis tool'; exit 1; \
@@ -974,7 +976,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 ; \