buildsystem: don't use recursive make for kconfig meta frontend

[kconfig-frontends] / frontends / qconf / Makefile.am

diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am
index f14164ef2d27feb0f85efbebe5915417579d57bc..bc4949894383cde954c25cd3f7e26a2fe1658f34 100644 (file)
--- a/frontends/qconf/Makefile.am
+++ b/frontends/qconf/Makefile.am
@@ -1,18 +1,24 @@
-bin_PROGRAMS = qconf
+bin_PROGRAMS = kconfig-qconf
 
-qconf_SOURCES = qconf.cc qconf.h
+kconfig_qconf_SOURCES = qconf.cc qconf.h
 BUILT_SOURCES = qconf.moc
-qconf_CPPFLAGS = $(AM_CPPFLAGS)         \
-                 $(GETTEXT)             \
-                 -I$(top_srcdir)/libs/parser    \
-                 -I$(top_builddir)/libs/images
-qconf_CXXFLAGS = $(AM_CXXFLAGS) \
-                 $(kf_CFLAGS)   \
-                 $(qt4_CFLAGS)
-qconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
-              $(top_builddir)/libs/images/libimages.a         \
-              $(qt4_LIBS) $(qconf_EXTRA_LIBS)
+kconfig_qconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
+                         $(intl_CPPFLAGS)               \
+                         -I$(top_srcdir)/libs/parser    \
+                         -I$(top_builddir)/libs/images
+kconfig_qconf_CXXFLAGS = $(AM_CXXFLAGS) \
+                         $(kf_CFLAGS)   \
+                         $(Qt5_CFLAGS)  \
+                         -fPIC
+kconfig_qconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
+                      $(top_builddir)/libs/images/libkconfig-images.a   \
+                      $(intl_LIBS) $(Qt5_LIBS) $(qconf_EXTRA_LIBS)
 CLEANFILES = qconf.moc
+EXTRA_DIST = qconf.cc.patch
+
+AM_V_MOC = $(AM_V_MOC_$(V))
+AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY))
+AM_V_MOC_0 = @echo "  MOC     " $@;
 
 .h.moc:
-       $(MOC) -i $< -o $@
+       $(AM_V_MOC)$(MOC) -i $< -o $@