version: bump packaging version

[kconfig-frontends] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a6bb262fc6b90947013a3322f6d92ef51859b429..020659b69c48e141c2aa2ff155a6a62d855ebabd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,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)
@@ -67,8 +70,8 @@ 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
 #
@@ -87,7 +90,7 @@ AM_V_GPERF_1 =
 
 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
+EXTRA_DIST += libs/parser/hconf.c libs/parser/yconf.y.patch
 
 # libs/parser/kconfig-parser.pc generated by AC_CONFIG_FILES in configure.ac
 pkgconfigdir = $(libdir)/pkg-config
@@ -277,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) \