frontends: prefix frontends with 'kconfig-'

By default, prefix the frontends executables with 'kconfig-'
to avoid any name-space collision ('conf' is too generic).

At the same time, prefix all libraries with kconfig-, for
consistency (except libkconfig-parser, which only gains a
dash in-between 'kconfig' and 'parser').

Besides, utilities (coming in a following cset) will all be
prefixed with 'kconfig-' to avoid name-space collision, too.

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

diff --git a/frontends/conf/Makefile.am b/frontends/conf/Makefile.am
index 310f41a16eb58c0cf319d798b5ce8b4598dc5c59..502fd7681aa591cf0fc039af90f30eb89211ebc7 100644 (file)
--- a/frontends/conf/Makefile.am
+++ b/frontends/conf/Makefile.am
@@ -1,9 +1,9 @@
-bin_PROGRAMS = conf
+bin_PROGRAMS = kconfig-conf
 
-conf_SOURCES = conf.c
-conf_CPPFLAGS = $(AM_CPPFLAGS)  \
-                $(GETTEXT)      \
-                -I$(top_srcdir)/libs/parser
-conf_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
-conf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la  \
-             $(conf_EXTRA_LIBS)
+kconfig_conf_SOURCES = conf.c
+kconfig_conf_CPPFLAGS = $(AM_CPPFLAGS)  \
+                        $(GETTEXT)      \
+                        -I$(top_srcdir)/libs/parser
+kconfig_conf_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
+kconfig_conf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
+                     $(conf_EXTRA_LIBS)

diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am
index e02b40d4172bede3368312f888c282bdd41fede2..aa4186a3c347d2771ac5691f6f416811b604aef7 100644 (file)
--- a/frontends/gconf/Makefile.am
+++ b/frontends/gconf/Makefile.am
@@ -1,16 +1,16 @@
-bin_PROGRAMS = gconf
+bin_PROGRAMS = kconfig-gconf
 
-gconf_SOURCES = gconf.c gconf.glade
-gconf_CPPFLAGS = $(AM_CPPFLAGS)         \
-                 $(GETTEXT)             \
-                 -I$(top_srcdir)/libs/parser    \
-                 -I$(top_builddir)/libs/images  \
-                 -DGUI_PATH='"$(pkgdatadir)/gconf.glade"'
-gconf_CFLAGS = $(AM_CFLAGS) \
-               $(kf_CFLAGS) \
-               $(gtk_CFLAGS)
-gconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
-              $(top_builddir)/libs/images/libimages.a         \
-              $(gtk_LIBS) $(gconf_EXTRA_LIBS)
-gconfdir = $(pkgdatadir)
-gconf_DATA = gconf.glade
+kconfig_gconf_SOURCES = gconf.c gconf.glade
+kconfig_gconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
+                         $(GETTEXT)                     \
+                         -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   \
+                      $(gtk_LIBS) $(gconf_EXTRA_LIBS)
+kconfig_gconfdir = $(pkgdatadir)
+kconfig_gconf_DATA = gconf.glade

diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am
index ea34964e626356d04cb0b3d7e8cbf28125d40186..e5ce1b33370724eb6f72b87f19ad428aadaa0720 100644 (file)
--- a/frontends/mconf/Makefile.am
+++ b/frontends/mconf/Makefile.am
@@ -1,13 +1,13 @@
-bin_PROGRAMS = mconf
+bin_PROGRAMS = kconfig-mconf
 
-mconf_SOURCES = mconf.c
-mconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
-                 -DCURSES_LOC='"$(CURSES_LOC)"' \
-                 $(GETTEXT)                     \
-                 -I$(top_srcdir)/libs                   \
-                 -I$(top_srcdir)/libs/parser
-mconf_CFLAGS = $(AM_CFLAGS) \
-               $(kf_CFLAGS)
-mconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
-              $(top_builddir)/libs/lxdialog/liblxdialog.a     \
-              $(ncurses_LIBS) $(mconf_EXTRA_LIBS)
+kconfig_mconf_SOURCES = mconf.c
+kconfig_mconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
+                         -DCURSES_LOC='"$(CURSES_LOC)"' \
+                         $(GETTEXT)                     \
+                         -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   \
+                      $(ncurses_LIBS) $(mconf_EXTRA_LIBS)

diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am
index 4a8341c71ef44e5c2eeed0363814067334d56cd8..9127dd9b1cbb205f561aebcc27323303b340f1f3 100644 (file)
--- a/frontends/nconf/Makefile.am
+++ b/frontends/nconf/Makefile.am
@@ -1,11 +1,11 @@
-bin_PROGRAMS = nconf
+bin_PROGRAMS = kconfig-nconf
 
-nconf_SOURCES = nconf.c nconf.gui.c nconf.h
-nconf_CPPFLAGS = $(AM_CPPFLAGS)     \
-                 $(GETTEXT)         \
-                 -I$(top_srcdir)/libs/parser
-nconf_CFLAGS = $(AM_CFLAGS)     \
-               $(kf_CFLAGS)
-nconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
-              $(ncurses_extra_LIBS) $(ncurses_LIBS) \
-              $(nconf_EXTRA_LIBS)
+kconfig_nconf_SOURCES = nconf.c nconf.gui.c nconf.h
+kconfig_nconf_CPPFLAGS = $(AM_CPPFLAGS) \
+                         $(GETTEXT)     \
+                         -I$(top_srcdir)/libs/parser
+kconfig_nconf_CFLAGS = $(AM_CFLAGS) \
+                       $(kf_CFLAGS)
+kconfig_nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
+                      $(ncurses_extra_LIBS) $(ncurses_LIBS)             \
+                      $(nconf_EXTRA_LIBS)

diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am
index f14164ef2d27feb0f85efbebe5915417579d57bc..99809b7a12d9ede30bd0a6b7ba411afc635a3a4b 100644 (file)
--- a/frontends/qconf/Makefile.am
+++ b/frontends/qconf/Makefile.am
@@ -1,17 +1,17 @@
-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)                 \
+                         $(GETTEXT)                     \
+                         -I$(top_srcdir)/libs/parser    \
+                         -I$(top_builddir)/libs/images
+kconfig_qconf_CXXFLAGS = $(AM_CXXFLAGS) \
+                         $(kf_CFLAGS)   \
+                         $(qt4_CFLAGS)
+kconfig_qconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la  \
+                      $(top_builddir)/libs/images/libkconfig-images.a   \
+                      $(qt4_LIBS) $(qconf_EXTRA_LIBS)
 CLEANFILES = qconf.moc
 
 .h.moc:

diff --git a/libs/images/Makefile.am b/libs/images/Makefile.am
index ae99e1912a948d6464f54ccaed822a1602a75106..13879c4f3430458bba8d3d9c1c76fd3ae6bb2675 100644 (file)
--- a/libs/images/Makefile.am
+++ b/libs/images/Makefile.am
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libimages.a
+noinst_LIBRARIES = libkconfig-images.a
 
-libimages_a_SOURCES = images.c_orig
-nodist_libimages_a_SOURCES = images.c
+libkconfig_images_a_SOURCES = images.c_orig
+nodist_libkconfig_images_a_SOURCES = images.c
 BUILT_SOURCES = images.c images.h
 CLEANFILES = images.c images.h
 

diff --git a/libs/lxdialog/Makefile.am b/libs/lxdialog/Makefile.am
index 2808a697b91d66fe5b68a572007679b800a52638..1526dddffaf5c49e3ecfbfab09072fb195dd796f 100644 (file)
--- a/libs/lxdialog/Makefile.am
+++ b/libs/lxdialog/Makefile.am
@@ -1,15 +1,15 @@
-noinst_LIBRARIES = liblxdialog.a
+noinst_LIBRARIES = libkconfig-lxdialog.a
 
-liblxdialog_a_SOURCES = \
-    checklist.c         \
-    dialog.h            \
-    inputbox.c          \
-    menubox.c           \
-    textbox.c           \
-    util.c              \
+libkconfig_lxdialog_a_SOURCES = \
+    checklist.c                 \
+    dialog.h                    \
+    inputbox.c                  \
+    menubox.c                   \
+    textbox.c                   \
+    util.c                      \
     yesno.c
 
-liblxdialog_a_CPPFLAGS = $(AM_CPPFLAGS)                   \
-                         -DCURSES_LOC='"${CURSES_LOC}"'   \
-                         $(GETTEXT)
+libkconfig_lxdialog_a_CPPFLAGS = $(AM_CPPFLAGS)                   \
+                                 -DCURSES_LOC='"${CURSES_LOC}"'   \
+                                 $(GETTEXT)
 liblxdialog_a_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)

diff --git a/libs/parser/Makefile.am b/libs/parser/Makefile.am
index 4170b62f7a7a07a0c26ffb2606acaad1bae2c175..123982a960b56b0cf9033ce8281c2f8f99b3f461 100644 (file)
--- a/libs/parser/Makefile.am
+++ b/libs/parser/Makefile.am
@@ -1,15 +1,15 @@
 SUFFIXES = .gperf
 
-lib_LTLIBRARIES = libkconfigparser.la
-libkconfigparser_la_SOURCES = yconf.y
-dist_EXTRA_libkconfigparser_la_SOURCES =  \
+lib_LTLIBRARIES = libkconfig-parser.la
+libkconfig_parser_la_SOURCES = yconf.y
+dist_EXTRA_libkconfig_parser_la_SOURCES = \
     hconf.gperf lconf.l                   \
     confdata.c menu.c symbol.c util.c     \
     expr.c expr.h lkc.h lkc_proto.h
-libkconfigparser_la_CPPFLAGS = -DROOTMENU="\"$(root_menu)\""    \
-                               -DCONFIG_=\"$(config_prefix)\"
-libkconfigparser_la_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
-libkconfigparser_la_LDFLAGS = -release $(KCONFIGPARSER_LIB_VERSION)
+libkconfig_parser_la_CPPFLAGS = -DROOTMENU="\"$(root_menu)\""   \
+                                -DCONFIG_=\"$(config_prefix)\"
+libkconfig_parser_la_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS)
+libkconfig_parser_la_LDFLAGS = -release $(KCONFIGPARSER_LIB_VERSION)
 
 kconfig_includedir = $(includedir)/kconfig
 kconfig_include_HEADERS = lkc.h expr.h lkc_proto.h
@@ -17,7 +17,7 @@ kconfig_include_HEADERS = lkc.h expr.h lkc_proto.h
 BUILT_SOURCES = hconf.c lconf.c
 CLEANFILES = hconf.c lconf.c yconf.c
 
-# Can't use libkconfigparser_a_CPPFLAGS, as it breaks dependencies
+# Can't use libkconfig_parser_a_CPPFLAGS, as it breaks dependencies
 yconf.o: CPPFLAGS+=$(GETTEXT)
 
 .gperf.c: