[vlc-devel] commit: Replace a nasty ugly construct with another similar one ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Apr 21 22:05:06 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 21 22:42:55 2008 +0300| [718b12955d45ddb36ffb52670c1d8ca4f2986a8e]

Replace a nasty ugly construct with another similar one

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=718b12955d45ddb36ffb52670c1d8ca4f2986a8e
---

 Makefile.am |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1f2b1ce..7dfb7bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -614,9 +614,9 @@ VLC.app: vlc
 		   $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
-	for i in `$(VLC_CONFIG) --target plugin` ; do \
+	find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
 	  if test -n "$$i" ; \
-	   then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+	   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/
@@ -772,10 +772,9 @@ package-win32-base-debug: package-win-common
 
 # Plugins
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+	find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
 	  if test -n "$$i" ; then \
-	    $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
-            "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
+	    $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
 	  fi ; done
 
 if BUILD_SKINS




More information about the vlc-devel mailing list