Makefile: unbreak build out-of-tree

[kconfig-frontends] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index caa18bace7163955f442112123c7e0b9717e0f35..3f2b843898b16f31e2397edaeac3f351f6375a5c 100644 (file)
--- 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
 
@@ -10,7 +13,7 @@ dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 noinst_LIBRARIES =
 
-CLEAN_FILES =
+CLEANFILES =
 BUILT_SOURCES =
 
 #===============================================================================
@@ -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
 #
@@ -82,9 +89,15 @@ AM_V_GPERF_0 = @echo "  GPERF   " $@;
        $(AM_V_LEX)$(LEXCOMPILE) -o$@ $<
 
 BUILT_SOURCES += libs/parser/hconf.c libs/parser/lconf.c
-CLEAN_FILES += libs/parser/hconf.c libs/parser/lconf.c libs/parser/yconf.c
+CLEANFILES += libs/parser/hconf.c libs/parser/lconf.c libs/parser/yconf.c
 EXTRA_DIST += 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
+EXTRA_DIST += libs/parser/kconfig-parser.pc.in
+
 #--------------------------
 # lxdialog lib (for mconf)
 if COND_lxdialog
@@ -128,7 +141,7 @@ libs/images/images.h: libs/images/images.c_orig
 BUILT_SOURCES += \
        libs/images/images.c \
        libs/images/images.h
-CLEAN_FILES += \
+CLEANFILES += \
        libs/images/images.c \
        libs/images/images.h
 
@@ -267,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) \
@@ -281,11 +295,12 @@ 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 $@
 
-CLEAN_FILES += frontends/qconf/qconf.moc
+CLEANFILES += frontends/qconf/qconf.moc
 EXTRA_DIST += frontends/qconf/qconf.cc.patch
 
 endif # COND_qconf
@@ -313,7 +328,7 @@ utils_kconfig_gettext_LDADD = \
        $(top_builddir)/libs/parser/libkconfig-parser.la \
        $(intl_LIBS)
 
-CLEAN_FILES += utils/kconfig-tweak
+CLEANFILES += utils/kconfig-tweak
 EXTRA_DIST += \
        utils/kconfig-tweak.in \
        utils/kconfig-tweak.in.patch