buildsystem: don't use recursive make for frontends

Not trivial, but pretty obvious: all frontends moved to the top-level
Makefile.am. One step further in getting rid of recursive make.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/Makefile.am b/Makefile.am
index 8be91bc893f23e78b781b6f7ca637a7dfbd88c6b..3a786f64660c8aa7cf5026a021aaf7c6c50ec214 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
 MAKEFLAGS = $(SILENT_MAKEFLAGS)
 
-SUBDIRS = libs frontends
+SUBDIRS = libs
 EXTRA_DIST = .version
 
 bin_PROGRAMS =
@@ -9,6 +9,7 @@ bin_SCRIPTS =
 dist_bin_SCRIPTS =
 
 CLEAN_FILES =
+BUILT_SOURCES =
 
 #===============================================================================
 # Docs
@@ -34,6 +35,144 @@ EXTRA_DIST += frontends/kconfig.in
 
 endif # COND_kconfig
 
+#--------------------------
+# conf frontend
+if COND_conf
+
+bin_PROGRAMS += frontends/conf/kconfig-conf
+
+frontends_conf_kconfig_conf_SOURCES = frontends/conf/conf.c
+frontends_conf_kconfig_conf_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(intl_CPPFLAGS) \
+       -I$(top_srcdir)/libs/parser
+frontends_conf_kconfig_conf_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(kf_CFLAGS)
+frontends_conf_kconfig_conf_LDADD = \
+       $(top_builddir)/libs/parser/libkconfig-parser.la \
+       $(intl_LIBS) \
+       $(conf_EXTRA_LIBS)
+
+endif # COND_conf
+
+#--------------------------
+# mconf frontend
+if COND_mconf
+
+bin_PROGRAMS += frontends/mconf/kconfig-mconf
+
+frontends_mconf_kconfig_mconf_SOURCES = frontends/mconf/mconf.c
+frontends_mconf_kconfig_mconf_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(ncurses_mconf_CPPFLAGS) \
+       $(intl_CPPFLAGS) \
+       -I$(top_srcdir)/libs \
+       -I$(top_srcdir)/libs/parser
+frontends_mconf_kconfig_mconf_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(kf_CFLAGS)
+frontends_mconf_kconfig_mconf_LDADD = \
+       $(top_builddir)/libs/parser/libkconfig-parser.la \
+       $(top_builddir)/libs/lxdialog/libkconfig-lxdialog.a \
+       $(intl_LIBS) $(ncurses_LIBS) $(mconf_EXTRA_LIBS)
+
+endif # COND_mconf
+
+#--------------------------
+# nconf frontend
+if COND_nconf
+
+bin_PROGRAMS += frontends/nconf/kconfig-nconf
+
+frontends_nconf_kconfig_nconf_SOURCES = \
+       frontends/nconf/nconf.c \
+       frontends/nconf/nconf.gui.c \
+       frontends/nconf/nconf.h
+frontends_nconf_kconfig_nconf_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(intl_CPPFLAGS) \
+       $(ncurses_nconf_CPPFLAGS) \
+       -I$(top_srcdir)/libs/parser
+frontends_nconf_kconfig_nconf_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(kf_CFLAGS)
+frontends_nconf_kconfig_nconf_LDADD = \
+       $(top_builddir)/libs/parser/libkconfig-parser.la \
+       $(intl_LIBS) $(ncurses_panel_menu_LIBS) $(ncurses_LIBS) \
+       $(nconf_EXTRA_LIBS)
+
+endif # COND_nconf
+
+#--------------------------
+# gconf frontend
+if COND_gconf
+
+bin_PROGRAMS += frontends/gconf/kconfig-gconf
+
+frontends_gconf_kconfig_gconf_SOURCES = \
+       frontends/gconf/gconf.c \
+       frontends/gconf/gconf.glade
+frontends_gconf_kconfig_gconf_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(intl_CPPFLAGS) \
+       -I$(top_srcdir)/libs/parser \
+       -I$(top_builddir)/libs/images \
+       -DGUI_PATH='"$(pkgdatadir)/gconf.glade"'
+frontends_gconf_kconfig_gconf_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(kf_CFLAGS) \
+       $(gtk_CFLAGS)
+frontends_gconf_kconfig_gconf_LDADD = \
+       $(top_builddir)/libs/parser/libkconfig-parser.la \
+       $(top_builddir)/libs/images/libkconfig-images.a \
+       $(intl_LIBS) \
+       $(gtk_LIBS) \
+       $(gconf_EXTRA_LIBS)
+frontends_gconf_kconfig_gconfdir = $(pkgdatadir)
+frontends_gconf_kconfig_gconf_DATA = frontends/gconf/gconf.glade
+
+EXTRA_DIST += frontends/gconf/gconf.c.patch
+
+endif # COND_gconf
+
+#--------------------------
+# gconf frontend
+if COND_qconf
+
+bin_PROGRAMS += frontends/qconf/kconfig-qconf
+
+frontends_qconf_kconfig_qconf_SOURCES = \
+       frontends/qconf/qconf.cc \
+       frontends/qconf/qconf.h
+BUILT_SOURCES += frontends/qconf/qconf.moc
+frontends_qconf_kconfig_qconf_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(intl_CPPFLAGS) \
+       -I$(top_srcdir)/libs/parser \
+       -I$(top_builddir)/libs/images
+frontends_qconf_kconfig_qconf_CXXFLAGS = \
+       $(AM_CXXFLAGS) \
+       $(kf_CFLAGS) \
+       $(Qt5_CFLAGS) \
+       -fPIC
+frontends_qconf_kconfig_qconf_LDADD = \
+       $(top_builddir)/libs/parser/libkconfig-parser.la \
+       $(top_builddir)/libs/images/libkconfig-images.a \
+       $(intl_LIBS) $(Qt5_LIBS) $(qconf_EXTRA_LIBS)
+
+AM_V_MOC = $(AM_V_MOC_$(V))
+AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY))
+AM_V_MOC_0 = @echo "  MOC     " $@;
+
+.h.moc:
+       $(AM_V_MOC)$(MOC) -i $< -o $@
+
+CLEAN_FILES += frontends/qconf/qconf.moc
+EXTRA_DIST += frontends/qconf/qconf.cc.patch
+
+endif # COND_qconf
+
 #===============================================================================
 # Utilities
 if COND_utils

diff --git a/configure.ac b/configure.ac
index bcd5ed2e14708834422fff09494247c45a9f736c..99705ecd41dfdb4fc32618432da8fe0eb5392e84 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -504,12 +504,6 @@ AC_CONFIG_FILES([
     libs/images/Makefile
     libs/lxdialog/Makefile
     libs/parser/Makefile
-    frontends/Makefile
-    frontends/conf/Makefile
-    frontends/mconf/Makefile
-    frontends/nconf/Makefile
-    frontends/gconf/Makefile
-    frontends/qconf/Makefile
 ])
 AC_OUTPUT
 

diff --git a/frontends/Makefile.am b/frontends/Makefile.am
deleted file mode 100644 (file)
index 0badbc8..0000000
--- a/frontends/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-if COND_conf
-    MAYBE_conf = conf
-endif
-if COND_mconf
-    MAYBE_mconf = mconf
-endif
-if COND_nconf
-    MAYBE_nconf = nconf
-endif
-if COND_gconf
-    MAYBE_gconf = gconf
-endif
-if COND_qconf
-    MAYBE_qconf = qconf
-endif
-SUBDIRS = $(MAYBE_conf) $(MAYBE_mconf) $(MAYBE_nconf) $(MAYBE_gconf) $(MAYBE_qconf)

diff --git a/frontends/conf/Makefile.am b/frontends/conf/Makefile.am
deleted file mode 100644 (file)
index 38db98f..0000000
--- a/frontends/conf/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS = kconfig-conf
-
-kconfig_conf_SOURCES = conf.c
-kconfig_conf_CPPFLAGS = $(AM_CPPFLAGS)      \
-                        $(intl_CPPFLAGS)    \
-                        -I$(top_srcdir)/libs/parser
-kconfig_conf_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
-kconfig_conf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
-                     $(intl_LIBS)                                      \
-                     $(conf_EXTRA_LIBS)

diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am
deleted file mode 100644 (file)
index abdb193..0000000
--- a/frontends/gconf/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-bin_PROGRAMS = kconfig-gconf
-
-kconfig_gconf_SOURCES = gconf.c gconf.glade
-kconfig_gconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
-                         $(intl_CPPFLAGS)               \
-                         -I$(top_srcdir)/libs/parser    \
-                         -I$(top_builddir)/libs/images  \
-                         -DGUI_PATH='"$(pkgdatadir)/gconf.glade"'
-kconfig_gconf_CFLAGS = $(AM_CFLAGS) \
-                       $(kf_CFLAGS) \
-                       $(gtk_CFLAGS)
-kconfig_gconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
-                      $(top_builddir)/libs/images/libkconfig-images.a   \
-                      $(intl_LIBS) $(gtk_LIBS) $(gconf_EXTRA_LIBS)
-kconfig_gconfdir = $(pkgdatadir)
-kconfig_gconf_DATA = gconf.glade
-EXTRA_DIST = gconf.c.patch

diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am
deleted file mode 100644 (file)
index 175a712..0000000
--- a/frontends/mconf/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-bin_PROGRAMS = kconfig-mconf
-
-kconfig_mconf_SOURCES = mconf.c
-kconfig_mconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
-                         $(ncurses_mconf_CPPFLAGS)      \
-                         $(intl_CPPFLAGS)               \
-                         -I$(top_srcdir)/libs           \
-                         -I$(top_srcdir)/libs/parser
-kconfig_mconf_CFLAGS = $(AM_CFLAGS) \
-                       $(kf_CFLAGS)
-kconfig_mconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la      \
-                      $(top_builddir)/libs/lxdialog/libkconfig-lxdialog.a   \
-                      $(intl_LIBS) $(ncurses_LIBS) $(mconf_EXTRA_LIBS)

diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am
deleted file mode 100644 (file)
index de0664b..0000000
--- a/frontends/nconf/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-bin_PROGRAMS = kconfig-nconf
-
-kconfig_nconf_SOURCES = nconf.c nconf.gui.c nconf.h
-kconfig_nconf_CPPFLAGS = $(AM_CPPFLAGS)             \
-                         $(intl_CPPFLAGS)           \
-                         $(ncurses_nconf_CPPFLAGS)  \
-                         -I$(top_srcdir)/libs/parser
-kconfig_nconf_CFLAGS = $(AM_CFLAGS) \
-                       $(kf_CFLAGS)
-kconfig_nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la          \
-                      $(intl_LIBS) $(ncurses_panel_menu_LIBS) $(ncurses_LIBS)   \
-                      $(nconf_EXTRA_LIBS)

diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am
deleted file mode 100644 (file)
index bc49498..0000000
--- a/frontends/qconf/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-bin_PROGRAMS = kconfig-qconf
-
-kconfig_qconf_SOURCES = qconf.cc qconf.h
-BUILT_SOURCES = qconf.moc
-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:
-       $(AM_V_MOC)$(MOC) -i $< -o $@