buildsystem: don't use recursive make for scripts

[kconfig-frontends] / configure.ac

diff --git a/configure.ac b/configure.ac
index 31eef710bbffadb1fdad36d39b7b34723e48c453..43fa06f99a485ddc8252f2d3edd2898c109a296d 100644 (file)
--- 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.
@@ -478,12 +478,16 @@ AS_IF([test "$enable_gconf" = "yes"], [fe_list="$fe_list gconf"])
 AS_IF([test "$enable_mconf" = "yes"], [fe_list="$fe_list mconf"])
 AS_IF([test "$enable_nconf" = "yes"], [fe_list="$fe_list nconf"])
 AS_IF([test "$enable_qconf" = "yes"], [fe_list="$fe_list qconf"])
+# The meta frontend is handled separatly, below, because we do not
+# want it in the list of tools, kcfg_list.
 
 [kcfg_list="$fe_list"]
 AS_IF([test "$enable_utils" = "yes"], [kcfg_list="$kcfg_list diff merge tweak"])
 AS_IF([test "$has_gettext" = "yes"],  [kcfg_list="$kcfg_list gettext"])
 AC_SUBST([kcfg_list], [${kcfg_list}])
 
+AS_IF([test "$enable_kconfig" = "yes"], [fe_list=" kconfig$fe_list"])
+
 [lib_list=]
 AS_IF(
     [test "$enable_shared" = "yes"],
@@ -507,8 +511,6 @@ AC_CONFIG_FILES([
     frontends/nconf/Makefile
     frontends/gconf/Makefile
     frontends/qconf/Makefile
-    utils/Makefile
-    scripts/Makefile
 ])
 AC_OUTPUT