Mafile: qconf must be compiled as C++11

[kconfig-frontends] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4106131eb07293ac48b8b5f4c9bc579797d820b7..78647a32305de91bf4549d421cf5690c5bfd7f1e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ noinst_LIBRARIES =
 
 CLEANFILES =
 DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 BUILT_SOURCES =
 
 #===============================================================================
@@ -89,9 +90,21 @@ AM_V_GPERF_1 =
 .l.c:
        $(AM_V_LEX)$(LEXCOMPILE) -o$@ $<
 
-BUILT_SOURCES += libs/parser/hconf.c libs/parser/lconf.c
-CLEANFILES += libs/parser/hconf.c libs/parser/lconf.c libs/parser/yconf.c
-EXTRA_DIST += libs/parser/hconf.c libs/parser/yconf.y.patch
+# yconf.c not listed, because it is the real _SOURCES, but others are
+# in _EXTRA_SOURCES (above), so must be listed:
+BUILT_SOURCES += \
+       libs/parser/hconf.c \
+       libs/parser/lconf.c
+# Still, .c files generated from .y files are not cleaned by default,
+# so yconf.c must be explicitly listed:
+MAINTAINERCLEANFILES += \
+       libs/parser/hconf.c \
+       libs/parser/lconf.c \
+       libs/parser/yconf.c
+EXTRA_DIST += \
+       libs/parser/hconf.c \
+       libs/parser/hconf.gperf.patch \
+       libs/parser/yconf.y.patch
 
 # libs/parser/kconfig-parser.pc generated by AC_CONFIG_FILES in configure.ac
 pkgconfigdir = $(libdir)/pkg-config
@@ -287,7 +300,7 @@ frontends_qconf_kconfig_qconf_CXXFLAGS = \
        $(AM_CXXFLAGS) \
        $(kf_CFLAGS) \
        $(Qt5_CFLAGS) \
-       -fPIC
+       -fPIC -std=c++11
 frontends_qconf_kconfig_qconf_LDADD = \
        $(top_builddir)/libs/parser/libkconfig-parser.la \
        $(top_builddir)/libs/images/libkconfig-images.a \