[vlc-commits] modules: move Modules.am stuff to genmf

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jun 23 19:52:00 2013 +0300| [9d29844fd102819008aadfa62eb9c6e017a149a8] | committer: Rémi Denis-Courmont

modules: move Modules.am stuff to genmf

This way, common.am can be included also in directories without a
Modules.am file.

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

 modules/common.am |    7 -------
 modules/genmf     |    6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/common.am b/modules/common.am
index 4dd3bb5..c766fc1 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -34,10 +34,3 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
 	-shrext $(LIBEXT) \
 	-no-undefined \
 	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
-
-include $(srcdir)/Modules.am
-
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-	$(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
-endif
diff --git a/modules/genmf b/modules/genmf
index 0b9bdb5..c6b2bca 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -45,6 +45,12 @@ libvlc_LTLIBRARIES = ${libvlc_ltlibs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include \$(top_srcdir)/modules/common.am
+include \$(srcdir)/Modules.am
+
+if MAINTAINER_MODE
+\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/modules/genmf
+	\$(AM_V_GEN)cd \\\$(top_srcdir) && \\\$(SHELL) modules/genmf \$(dir)
+endif
 
 EOF
   for mod in $mods