X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=452a1f6117e81b18c38669acbd014a7ba2d3dc4a;hb=6d44cf441801dc76e4c61ddcb4d834cb3c4b4ab6;hp=56a82216cf22508d46f2b1867a679cf7602c8f98;hpb=d9f9ab15fd354bca08d1024f3450833c4690f1e7;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 56a82216cf..452a1f6117 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -281,7 +281,7 @@ vlc-config.in: vlc-config.in.in
 	./config.status --recheck
 	touch $@
 
-CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
+CLEANFILES = $(BUILT_SOURCES_clean)
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
@@ -291,7 +291,7 @@ libvlc:
 	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
+	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
@@ -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
@@ -1002,8 +1001,8 @@ package-macosx-zip:
 	mkdir -p $(top_builddir)/vlc-$(VERSION)
 	cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
 	mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
-	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do
-	  cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies/
+	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \
+	  cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies; \
 	done
 	cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
 	     $(top_builddir)/vlc-$(VERSION)/Goodies
@@ -1108,19 +1107,6 @@ update-po:
 
 #cd po && $(MAKE) update-po
 
-###############################################################################
-# Stamp rules
-###############################################################################
-stamp-builtin:
-	@for dep in "" `$(VLC_CONFIG) --target plugin`; do \
-	  if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
-	    touch "$@"; \
-	    break; \
-	  fi; \
-	done
-
-.PHONY: stamp-builtin
-
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable
 ###############################################################################