From 2ca06102fecb5deadd72fdae66b1e42a1836a93b Mon Sep 17 00:00:00 2001
From: Ralph Sennhauser <sera@gentoo.org>
Date: Sun, 30 Dec 2012 11:06:38 +0000
Subject: Switch to non-recursive Makefile.

svn path=/projects/eselect-java/trunk/; revision=9128
---
 Makefile.am             | 25 +++++++++++++++++++++++--
 configure.ac            |  4 ++--
 src/modules/Makefile.am | 19 -------------------
 3 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 src/modules/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 780af9c..8e45141 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,18 @@
-SUBDIRS = src/modules
+modulesdir=$(datadir)/eselect/modules/
+
+modules_DATA = \
+	src/modules/ecj.eselect \
+	src/modules/java-nsplugin.eselect \
+	src/modules/java-vm.eselect \
+	src/modules/maven.eselect
+
+EXTRA_DIST = \
+	src/modules/ecj.eselect.in \
+	src/modules/java-nsplugin.eselect.in \
+	src/modules/java-vm.eselect.in \
+	src/modules/maven.eselect.in
+
+CLEANFILES = $(modules_DATA)
 
 MAINTAINERCLEANFILES = \
 	aclocal.m4 \
@@ -8,7 +22,7 @@ MAINTAINERCLEANFILES = \
 	Makefile.in \
 	INSTALL
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	ChangeLog.old.eselect-ecj \
 	ChangeLog.old.eselect-java-nsplugin \
 	ChangeLog.old.eselect-java-vm \
@@ -17,6 +31,13 @@ EXTRA_DIST = \
 	NEWS \
 	README
 
+
+create-modules-dir:
+	$(MKDIR_P) $(top_builddir)/src/modules
+
+$(modules_DATA): | create-modules-dir
+	$(SED) "s|\@VERSION\@|@PACKAGE_VERSION@|g" $(top_srcdir)/$@.in >$@
+
 dist-hook:
 	if test -d "$(srcdir)"/.svn ; then \
 		echo "Generating ChangeLog ..." ; \
diff --git a/configure.ac b/configure.ac
index d4bd33f..5252a60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,9 @@ AC_PREREQ([2.68])
 AC_CONFIG_SRCDIR([src/modules/java-vm.eselect.in])
 AM_INIT_AUTOMAKE([1.11])
 
-AC_PATH_PROG([SED],[sed])
+AC_PROG_MKDIR_P
+AC_PROG_SED
 
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([src/modules/Makefile])
 
 AC_OUTPUT
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
deleted file mode 100644
index 9e7ee74..0000000
--- a/src/modules/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-modulesdir=$(datadir)/eselect/modules/
-
-modules_DATA = \
-	ecj.eselect \
-	java-nsplugin.eselect \
-	java-vm.eselect \
-	maven.eselect
-
-EXTRA_DIST = \
-	ecj.eselect.in \
-	java-nsplugin.eselect.in \
-	java-vm.eselect.in \
-	maven.eselect.in
-
-CLEANFILES = $(modules_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-%.eselect : %.eselect.in
-	$(SED) "s|\@VERSION\@|@PACKAGE_VERSION@|g" $< >$@
-- 
cgit v1.2.3-65-gdbad