Synchronise with v3.11-rc5

[kconfig-frontends] / frontends / Makefile.am

diff --git a/frontends/Makefile.am b/frontends/Makefile.am
index a1121fe786946be86e25bce1dcd13df7fe5205ed..0badbc8c6d95a4b43c2dedd8d235a33955465e75 100644 (file)
--- a/frontends/Makefile.am
+++ b/frontends/Makefile.am
@@ -7,4 +7,10 @@ endif
 if COND_nconf
     MAYBE_nconf = nconf
 endif
-SUBDIRS = $(MAYBE_conf) $(MAYBE_mconf) $(MAYBE_nconf)
+if COND_gconf
+    MAYBE_gconf = gconf
+endif
+if COND_qconf
+    MAYBE_qconf = qconf
+endif
+SUBDIRS = $(MAYBE_conf) $(MAYBE_mconf) $(MAYBE_nconf) $(MAYBE_gconf) $(MAYBE_qconf)