[vlc-devel] commit: Remove a bunch of obsoleted kludges ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Apr 28 21:45:12 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 28 22:31:32 2008 +0300| [3e82c0f591561f29fcfbf7c6f35d08f79cfd8f4e]

Remove a bunch of obsoleted kludges

We don't need to invoke make twice in every directory, and we don't need
the awful libtool install kludge anymore.

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

 modules/common.am |   31 -------------------------------
 1 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/modules/common.am b/modules/common.am
index 727a230..1036b8e 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -33,41 +33,10 @@ AM_LDFLAGS += -export-symbol-regex ^vlc_entry
 endif
 endif
 
-all: all-modules
-
 nice:
 	$(top_builddir)/compile
 
-# Find out which modules were enabled and tell make to build them
-all-modules:
-	@set fnord $$MAKEFLAGS; amf=$$2; targets=`\
-	z=$$($(VLC_CONFIG) --list plugin); for mod in $(mods); do case "$$z " in *\ $${mod}\ *) echo lib$${mod}_plugin.la;; esac; done; \
-	`; case "$$targets" in *lib*) $(MAKE) $(AM_MAKEFLAGS) $$targets || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \
-	test -z "$$fail"
-
 if MAINTAINER_MODE
 $(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
 	cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
 endif
-
-mostlyclean-local:
-	-rm -f -- *.la
-
-### automake creates libvlcdir after running install-*-local
-### so we have to create it ourselves first
-install-exec-local: all-modules
-	@if test -z "$(libvlc_LTLIBRARIES)"; then \
-	  z=$$($(VLC_CONFIG) --list plugin); \
-	  m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \
-	  test -z "$$m" || \
-	    $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" install-libvlcLTLIBRARIES || exit $$? ; \
-	fi
-
-uninstall-local:
-	@if test -z "$(libvlc_LTLIBRARIES)"; then \
-	  z=$$($(VLC_CONFIG) --list plugin); \
-	  m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \
-	  test -z "$$m" || \
-	    $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" uninstall-libvlcLTLIBRARIES || exit $$?; \
-	fi
-




More information about the vlc-devel mailing list