Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index fab4fb354e1bc6227cbe2452935d0fc493adcd26..5e4d65f57e381b811050e6e620243e813e526b06 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -6,82 +6,29 @@
 # Authors: Sam Hocevar <sam@zoy.org>
 
 NULL =
-SUFFIXES = _plugin$(LIBEXT) _plugin.la
-
-libvlcdir = $(libdir)/vlc/$(basedir)
-libvlc_LTLIBRARIES =
+libvlcdir = $(vlclibdir)/plugins/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
-CLEANFILES =
-
-include $(srcdir)/Modules.am
+CLEANFILES = $(BUILT_SOURCES)
 
-if HAVE_PLUGINS
-LTLIBVLC = $(top_builddir)/src/libvlc.la
+LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
 AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
 AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
 AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
-       -avoid-version -module -no-undefined \
+       -avoid-version -module \
+       -export-symbol-regex ^vlc_entry \
        -shrext $(LIBEXT) \
+       -rpath "$(libvlcdir)" \
+       -no-undefined \
         `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = $(LTLIBVLC)
-
-if HAVE_COMPILER_EXPORT
-AM_LDFLAGS += -export-dynamic
-else
-AM_LDFLAGS += -export-symbol-regex ^vlc_entry
-endif
-endif
-
-all: all-modules
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
+       $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
 
-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"
-
-# Build a plugin with the adequate linker and linker's flags
-_plugin.la_plugin$(LIBEXT):
-       @mod="$*" ; mod=$${mod#lib} ; \
-       ldfl="`$(VLC_CONFIG) --libs plugin $$mod` $(LIBVLC) -u $(SYMPREF)$(VLC_ENTRY)" ; \
-       case `$(VLC_CONFIG) --linkage $$mod` in \
-         c++)  ld="$(CXXLINK)" ;; \
-         objc) ld="$(OBJCLINK)" ;; \
-         c|*)  ld="$(LINK)" ;; \
-       esac ; \
-       echo $$ld $< $$ldfl ; \
-       $$ld $< $$ldfl
+include $(srcdir)/Modules.am
 
 if MAINTAINER_MODE
 $(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-       cd \$(top_srcdir) && \$(SHELL) modules/genmf ${dir}
+       $(AM_V_GEN)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
-