From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Tue, 23 Aug 2016 18:00:24 +0000 (+0200)
Subject: buildsystem: don't use recursive make for kconfig meta frontend
X-Git-Tag: v4.8.0.0~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;ds=sidebyside;h=634dfecab4373411e6be4eb74ef092f735c41f8a;hp=326dfe87c385f79b83dfc337843680c3eeb5e894;p=kconfig-frontends

buildsystem: don't use recursive make for kconfig meta frontend

Yet anotehr step to get rid of the recursive make.

We're now defining more than one bin_SCRIPT, so use += when assigning to
it. This also requires it be at least assinged once with =. Do that with
an empty value. Do so also for a few other variables.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---

diff --git a/Makefile.am b/Makefile.am
index cdb3f00..8be91bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,23 +4,47 @@ MAKEFLAGS = $(SILENT_MAKEFLAGS)
 SUBDIRS = libs frontends
 EXTRA_DIST = .version
 
+bin_PROGRAMS =
+bin_SCRIPTS =
+dist_bin_SCRIPTS =
+
+CLEAN_FILES =
+
 #===============================================================================
 # Docs
 dist_doc_DATA = \
 	docs/kconfig-language.txt \
 	docs/kconfig.txt
 
+#===============================================================================
+# Frontends
+
+#--------------------------
+# kconfig meta frontend
+if COND_kconfig
+
+bin_SCRIPTS += frontends/kconfig
+
+frontends/kconfig: frontends/kconfig.in
+	$(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \
+		$< >$@
+	@chmod +x $@
+
+EXTRA_DIST += frontends/kconfig.in
+
+endif # COND_kconfig
+
 #===============================================================================
 # Utilities
 if COND_utils
 
-bin_SCRIPTS = utils/kconfig-tweak
-dist_bin_SCRIPTS = utils/kconfig-diff utils/kconfig-merge
+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
-bin_PROGRAMS = $(MAYBE_utils_gettext)
+bin_PROGRAMS += $(MAYBE_utils_gettext)
 
 utils_kconfig_gettext_SOURCES = utils/gettext.c
 utils_kconfig_gettext_CPPFLAGS = \
@@ -33,7 +57,7 @@ utils_kconfig_gettext_LDADD = \
 	$(top_builddir)/libs/parser/libkconfig-parser.la \
 	$(intl_LIBS)
 
-CLEAN_FILES = utils/kconfig-tweak
+CLEAN_FILES += utils/kconfig-tweak
 EXTRA_DIST += \
 	utils/kconfig-tweak.in \
 	utils/kconfig-tweak.in.patch
diff --git a/frontends/Makefile.am b/frontends/Makefile.am
index 6e77564..0badbc8 100644
--- a/frontends/Makefile.am
+++ b/frontends/Makefile.am
@@ -1,6 +1,3 @@
-if COND_kconfig
-    MAYBE_kconfig = kconfig
-endif
 if COND_conf
     MAYBE_conf = conf
 endif
@@ -17,12 +14,3 @@ if COND_qconf
     MAYBE_qconf = qconf
 endif
 SUBDIRS = $(MAYBE_conf) $(MAYBE_mconf) $(MAYBE_nconf) $(MAYBE_gconf) $(MAYBE_qconf)
-
-EXTRA_DIST = kconfig.in
-
-bin_SCRIPTS = $(MAYBE_kconfig)
-
-kconfig: kconfig.in
-	$(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g'      \
-	                  $< >$@
-	@chmod +x $@