synchronise with 3.5-rc1

[kconfig-frontends] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6fc54dc9a9738c235ce9177e61d310082fe9d109..2dfdf75cee09d7a2e2593ee7f0aee7705f5f522e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,6 @@
 ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
-SUBDIRS = docs libs frontends
+if COND_utils
+    MAYBE_utils = utils
+endif
+SUBDIRS = docs libs frontends scripts $(MAYBE_utils)
+EXTRA_DIST = bootstrap .version