From 7469a56a00704644e2fa17beb79204898bb36145 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 23 Aug 2016 19:11:19 +0200
Subject: [PATCH] buildsystem: don't use recursive make for utils

Using a recursive make can't make effective use of parallelism.

This is the first step in getting rid of recursive make altogether,
starting from the simplest things: utils.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 .gitignore        |  1 +
 Makefile.am       | 39 ++++++++++++++++++++++++++++++++++++---
 configure.ac      |  3 +--
 utils/Makefile.am | 21 ---------------------
 4 files changed, 38 insertions(+), 26 deletions(-)
 delete mode 100644 utils/Makefile.am

diff --git a/.gitignore b/.gitignore
index 95fc7fc..a4095f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ stamp-h1
 .deps/
 /autom4te.cache/
 /scripts/.autostuff
+.dirstamp
 
 kconfig-frontends-*.tar*
 kconfig-frontends-*.shar*
diff --git a/Makefile.am b/Makefile.am
index 6ce76a0..6741d70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,40 @@
 ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
 MAKEFLAGS = $(SILENT_MAKEFLAGS)
+
+SUBDIRS = docs libs frontends scripts
+EXTRA_DIST = .version
+
+#===============================================================================
+# Utilities
 if COND_utils
-    MAYBE_utils = utils
+
+bin_SCRIPTS = utils/kconfig-tweak
+dist_bin_SCRIPTS = utils/kconfig-diff utils/kconfig-merge
+
+if COND_utils_gettext
+MAYBE_utils_gettext = utils/kconfig-gettext
 endif
-SUBDIRS = docs libs frontends scripts $(MAYBE_utils)
-EXTRA_DIST = .version
+bin_PROGRAMS = $(MAYBE_utils_gettext)
+
+utils_kconfig_gettext_SOURCES = utils/gettext.c
+utils_kconfig_gettext_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/libs/parser
+utils_kconfig_gettext_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(kf_CFLAGS)
+utils_kconfig_gettext_LDADD = \
+	$(top_builddir)/libs/parser/libkconfig-parser.la \
+	$(intl_LIBS)
+
+CLEAN_FILES = utils/kconfig-tweak
+EXTRA_DIST += \
+	utils/kconfig-tweak.in \
+	utils/kconfig-tweak.in.patch
+
+utils/kconfig-tweak: utils/kconfig-tweak.in
+	$(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \
+		$< >$@
+	@chmod +x $@
+
+endif # COND_utils
diff --git a/configure.ac b/configure.ac
index 3a0575a..13cfbdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([scripts/.autostuff/m4])
 #----------------------------------------
 # Prepare automake
 
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 # For releases, enable silent rules, unless the user explicitly
 # disables them.
@@ -511,7 +511,6 @@ AC_CONFIG_FILES([
     frontends/nconf/Makefile
     frontends/gconf/Makefile
     frontends/qconf/Makefile
-    utils/Makefile
     scripts/Makefile
 ])
 AC_OUTPUT
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 6438110..0000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-bin_SCRIPTS = kconfig-tweak
-dist_bin_SCRIPTS = kconfig-diff kconfig-merge
-
-if COND_utils_gettext
-    MAYBE_utils_gettext = kconfig-gettext
-endif
-bin_PROGRAMS = $(MAYBE_utils_gettext)
-
-kconfig_gettext_SOURCES = gettext.c
-kconfig_gettext_CPPFLAGS = $(AM_CPPFLAGS)   \
-                           -I$(top_srcdir)/libs/parser
-kconfig_gettext_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
-kconfig_gettext_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la    \
-                        $(intl_LIBS)
-CLEANFILES = kconfig-tweak
-EXTRA_DIST = kconfig-tweak.in kconfig-tweak.in.patch
-
-kconfig-tweak: kconfig-tweak.in
-	$(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g"    \
-	                  $< >$@
-	@chmod +x $@
-- 
2.39.2