X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile.am;h=78647a32305de91bf4549d421cf5690c5bfd7f1e;hb=7a0553b70f2fdf14d101c69f98a70e62faa08395;hp=1bde1e36c5f7ec2b0fc62772921fd00c8226cddc;hpb=c5e2919f40a83e52322e689e9e7791d57b569cc7;p=kconfig-frontends

diff --git a/Makefile.am b/Makefile.am
index 1bde1e3..78647a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
-MAKEFLAGS = $(SILENT_MAKEFLAGS)
+MAKEFLAGS = $(SILENT_MAKEFLAGS_$(V))
+SILENT_MAKEFLAGS_ = $(SILENT_MAKEFLAGS_$(AM_DEFAULT_VERBOSITY))
+SILENT_MAKEFLAGS_0 = --no-print-directory -s
+SILENT_MAKEFLAGS_1 =
 
 EXTRA_DIST = .version
 
@@ -11,6 +14,8 @@ lib_LTLIBRARIES =
 noinst_LIBRARIES =
 
 CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 BUILT_SOURCES =
 
 #===============================================================================
@@ -40,7 +45,10 @@ dist_EXTRA_libs_parser_libkconfig_parser_la_SOURCES = \
 libs_parser_libkconfig_parser_la_CPPFLAGS = \
 	-DROOTMENU="\"$(root_menu)\"" \
 	-DCONFIG_=\"$(config_prefix)\" \
-	$(intl_CPPFLAGS)
+	-DGPERF_LEN_TYPE="$(GPERF_LEN_TYPE)" \
+	$(intl_CPPFLAGS) \
+	-I$(top_srcdir)/libs/parser \
+	-I$(top_builddir)/libs/parser
 libs_parser_libkconfig_parser_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(kf_CFLAGS)
@@ -59,12 +67,13 @@ libs_parser_kconfig_include_HEADERS = \
 AM_V_GPERF = $(AM_V_GPERF_$(V))
 AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
 AM_V_GPERF_0 = @echo "  GPERF   " $@;
+AM_V_GPERF_1 =
 
 .gperf.c:
 	$(AM_V_GPERF)$(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<
 
-# The following rule produces a warning:
-#   libs/parser/Makefile.am:41: user target `.l.c' defined here...
+# The following rule may produce a warning with some versions of automake:
+#   Makefile.am:85: user target `.l.c' defined here...
 #   /usr/share/automake-1.11/am/lex.am: ... overrides Automake target
 #   `.l.c' defined here
 #
@@ -81,14 +90,26 @@ AM_V_GPERF_0 = @echo "  GPERF   " $@;
 .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/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
 pkgconfig_DATA = libs/parser/kconfig-parser.pc
-CLEANFILES += libs/parser/kconfig-parser.pc
+DISTCLEANFILES += libs/parser/kconfig-parser.pc
 EXTRA_DIST += libs/parser/kconfig-parser.pc.in
 
 #--------------------------
@@ -273,12 +294,13 @@ frontends_qconf_kconfig_qconf_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(intl_CPPFLAGS) \
 	-I$(top_srcdir)/libs/parser \
-	-I$(top_builddir)/libs/images
+	-I$(top_builddir)/libs/images \
+	-I$(top_builddir)/frontends/qconf
 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 \
@@ -287,6 +309,7 @@ frontends_qconf_kconfig_qconf_LDADD = \
 AM_V_MOC = $(AM_V_MOC_$(V))
 AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY))
 AM_V_MOC_0 = @echo "  MOC     " $@;
+AM_V_MOC_1 =
 
 .h.moc:
 	$(AM_V_MOC)$(MOC) -i $< -o $@