X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile.am;h=3f2b843898b16f31e2397edaeac3f351f6375a5c;hb=5bb1084ddc395fe8b5193a3d85a4daa86fef49a4;hp=1bde1e36c5f7ec2b0fc62772921fd00c8226cddc;hpb=c5e2919f40a83e52322e689e9e7791d57b569cc7;p=kconfig-frontends

diff --git a/Makefile.am b/Makefile.am
index 1bde1e3..3f2b843 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
 
@@ -40,7 +43,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 +65,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
 #
@@ -273,7 +280,8 @@ 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) \
@@ -287,6 +295,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 $@