X-Git-Url: https://git.sur5r.net/?p=kconfig-frontends;a=blobdiff_plain;f=Makefile.am;h=2b061e4b169951da183af10cea12494e5024b27e;hp=8b648a16febb0d6769c52d501d2774d7691a62f7;hb=HEAD;hpb=156d45afa762abcfa7416e08e0f8706b0bbeddae

diff --git a/Makefile.am b/Makefile.am
index 8b648a1..2b061e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ noinst_LIBRARIES =
 
 CLEANFILES =
 DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 BUILT_SOURCES =
 
 #===============================================================================
@@ -68,7 +69,11 @@ AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
 AM_V_GPERF_0 = @echo "  GPERF   " $@;
 AM_V_GPERF_1 =
 
+# In theory, the destination directory already exists, because there is at
+# least the .pc file created by configure, but better safe than sorry, so
+# we create the directory now.
 .gperf.c:
+	$(MKDIR_P) $(@D)
 	$(AM_V_GPERF)$(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<
 
 # The following rule may produce a warning with some versions of automake:
@@ -86,18 +91,32 @@ AM_V_GPERF_1 =
 # uses zconf in lieue of the original yy), then the output file is
 # also renamed, but automake does not now that, and make would fail
 # because it would think no file was generated.
+#
+# In theory, the destination directory already exists, because there is at
+# least the .pc file created by configure, but better safe than sorry, so
+# we create the directory now.
 .l.c:
+	$(MKDIR_P) $(@D)
 	$(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
+# 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
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libs/parser/kconfig-parser.pc
 DISTCLEANFILES += libs/parser/kconfig-parser.pc
 EXTRA_DIST += libs/parser/kconfig-parser.pc.in
@@ -136,9 +155,11 @@ libs_images_libkconfig_images_a_SOURCES = libs/images/images.c_orig
 nodist_libs_images_libkconfig_images_a_SOURCES = libs/images/images.c
 
 libs/images/images.c: libs/images/images.c_orig
+	$(MKDIR_P) $(@D)
 	$(AM_V_GEN)$(SED) -e 's/^static //' $< >$@
 
 libs/images/images.h: libs/images/images.c_orig
+	$(MKDIR_P) $(@D)
 	$(AM_V_GEN)$(SED) -e '/^static \(const char \*xpm_\(.\{1,\}\)\[\]\) = {/!d; s//extern \1;/' \
 		$< >$@
 
@@ -161,6 +182,7 @@ if COND_kconfig
 bin_SCRIPTS += frontends/kconfig
 
 frontends/kconfig: frontends/kconfig.in
+	$(MKDIR_P) $(@D)
 	$(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \
 		$< >$@
 	@chmod +x $@
@@ -290,7 +312,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 \
@@ -338,6 +360,7 @@ EXTRA_DIST += \
 	utils/kconfig-tweak.in.patch
 
 utils/kconfig-tweak: utils/kconfig-tweak.in
+	$(MKDIR_P) $(@D)
 	$(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \
 		$< >$@
 	@chmod +x $@