From 9e4343959cbc3a57a3e6a0ab7602d9482b15893d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 20 Jan 2012 23:35:54 +0100 Subject: [PATCH] misc: move the parser and the lxdialog to libs/ Signed-off-by: "Yann E. MORIN" --- .hgignore | 4 +--- Makefile.am | 2 +- configure.ac | 5 +++-- frontends/conf/Makefile.am | 4 ++-- frontends/gconf/Makefile.am | 10 +++++----- frontends/mconf/Makefile.am | 6 ++++-- frontends/nconf/Makefile.am | 9 +++++---- libs/Makefile.am | 1 + {lxdialog => libs/lxdialog}/.gitignore | 0 {lxdialog => libs/lxdialog}/BIG.FAT.WARNING | 0 {lxdialog => libs/lxdialog}/Makefile.am | 0 {lxdialog => libs/lxdialog}/checklist.c | 0 {lxdialog => libs/lxdialog}/dialog.h | 0 {lxdialog => libs/lxdialog}/inputbox.c | 0 {lxdialog => libs/lxdialog}/menubox.c | 0 {lxdialog => libs/lxdialog}/textbox.c | 0 {lxdialog => libs/lxdialog}/util.c | 0 {lxdialog => libs/lxdialog}/yesno.c | 0 {parser => libs/parser}/Makefile.am | 0 {parser => libs/parser}/confdata.c | 0 {parser => libs/parser}/expr.c | 0 {parser => libs/parser}/expr.h | 0 {parser => libs/parser}/hconf.gperf | 0 {parser => libs/parser}/lconf.l | 0 {parser => libs/parser}/lkc.h | 0 {parser => libs/parser}/lkc_proto.h | 0 {parser => libs/parser}/menu.c | 0 {parser => libs/parser}/symbol.c | 0 {parser => libs/parser}/util.c | 0 {parser => libs/parser}/yconf.y | 0 30 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 libs/Makefile.am rename {lxdialog => libs/lxdialog}/.gitignore (100%) rename {lxdialog => libs/lxdialog}/BIG.FAT.WARNING (100%) rename {lxdialog => libs/lxdialog}/Makefile.am (100%) rename {lxdialog => libs/lxdialog}/checklist.c (100%) rename {lxdialog => libs/lxdialog}/dialog.h (100%) rename {lxdialog => libs/lxdialog}/inputbox.c (100%) rename {lxdialog => libs/lxdialog}/menubox.c (100%) rename {lxdialog => libs/lxdialog}/textbox.c (100%) rename {lxdialog => libs/lxdialog}/util.c (100%) rename {lxdialog => libs/lxdialog}/yesno.c (100%) rename {parser => libs/parser}/Makefile.am (100%) rename {parser => libs/parser}/confdata.c (100%) rename {parser => libs/parser}/expr.c (100%) rename {parser => libs/parser}/expr.h (100%) rename {parser => libs/parser}/hconf.gperf (100%) rename {parser => libs/parser}/lconf.l (100%) rename {parser => libs/parser}/lkc.h (100%) rename {parser => libs/parser}/lkc_proto.h (100%) rename {parser => libs/parser}/menu.c (100%) rename {parser => libs/parser}/symbol.c (100%) rename {parser => libs/parser}/util.c (100%) rename {parser => libs/parser}/yconf.y (100%) diff --git a/.hgignore b/.hgignore index 696c0e3..ec7eb5d 100644 --- a/.hgignore +++ b/.hgignore @@ -9,7 +9,7 @@ frontends/gconf/gconf frontends/mconf/mconf frontends/nconf/nconf -parser/?conf.c +libs/parser/?conf.c aclocal.m4 configure @@ -20,8 +20,6 @@ config.status Makefile Makefile.in -lxdialog/Makefile -lxdialog/Makefile.in stamp-h1 .deps/ diff --git a/Makefile.am b/Makefile.am index 068a42b..aad98af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = lxdialog parser frontends +SUBDIRS = libs frontends diff --git a/configure.ac b/configure.ac index fd4563e..9b6bf39 100644 --- a/configure.ac +++ b/configure.ac @@ -143,8 +143,9 @@ AM_CONDITIONAL( # Finalise AC_CONFIG_FILES([ Makefile - lxdialog/Makefile - parser/Makefile + libs/Makefile + libs/lxdialog/Makefile + libs/parser/Makefile frontends/Makefile frontends/conf/Makefile frontends/mconf/Makefile diff --git a/frontends/conf/Makefile.am b/frontends/conf/Makefile.am index 72f9a7c..c8068df 100644 --- a/frontends/conf/Makefile.am +++ b/frontends/conf/Makefile.am @@ -3,5 +3,5 @@ bin_PROGRAMS = conf conf_SOURCES = conf.c conf_CPPFLAGS = $(AM_CPPFLAGS) \ $(GETTEXT) \ - -I../../parser -conf_LDADD = ../../parser/libkconfigparser.a + -I../../libs/parser +conf_LDADD = ../../libs/parser/libkconfigparser.a diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am index 76fbf26..3f34d6e 100644 --- a/frontends/gconf/Makefile.am +++ b/frontends/gconf/Makefile.am @@ -2,13 +2,13 @@ bin_PROGRAMS = gconf gconf_SOURCES = gconf.c gconf.glade dist_EXTRA_gconf_SOURCES = images.c -gconf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ - -I../../parser \ +gconf_CPPFLAGS = $(AM_CPPFLAGS) \ + $(GETTEXT) \ + -I../../libs/parser \ -DGUI_PATH='"$(pkgdatadir)/gconf.glade"' gconf_CFLAGS = $(AM_CFLAGS) \ $(gtk_CFLAGS) -gconf_LDADD = $(gtk_LIBS) \ - ../../parser/libkconfigparser.a +gconf_LDADD = $(gtk_LIBS) \ + ../../libs/parser/libkconfigparser.a gconfdir = $(pkgdatadir) gconf_DATA = gconf.glade diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am index 7c784e2..4e06958 100644 --- a/frontends/mconf/Makefile.am +++ b/frontends/mconf/Makefile.am @@ -4,5 +4,7 @@ mconf_SOURCES = mconf.c mconf_CPPFLAGS = $(AM_CPPFLAGS) \ -DCURSES_LOC='"${CURSES_LOC}"' \ $(GETTEXT) \ - -I../../parser -mconf_LDADD = ../../parser/libkconfigparser.a ../../lxdialog/liblxdialog.a + -I../../libs \ + -I../../libs/parser +mconf_LDADD = ../../libs/parser/libkconfigparser.a \ + ../../libs/lxdialog/liblxdialog.a diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am index f952e71..b439c83 100644 --- a/frontends/nconf/Makefile.am +++ b/frontends/nconf/Makefile.am @@ -1,7 +1,8 @@ bin_PROGRAMS = nconf nconf_SOURCES = nconf.c nconf.gui.c nconf.h -nconf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ - -I../../parser -nconf_LDADD = ../../parser/libkconfigparser.a -lmenu -lpanel +nconf_CPPFLAGS = $(AM_CPPFLAGS) \ + $(GETTEXT) \ + -I../../libs/parser +nconf_LDADD = -lmenu -lpanel \ + ../../libs/parser/libkconfigparser.a diff --git a/libs/Makefile.am b/libs/Makefile.am new file mode 100644 index 0000000..6e11169 --- /dev/null +++ b/libs/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = parser lxdialog diff --git a/lxdialog/.gitignore b/libs/lxdialog/.gitignore similarity index 100% rename from lxdialog/.gitignore rename to libs/lxdialog/.gitignore diff --git a/lxdialog/BIG.FAT.WARNING b/libs/lxdialog/BIG.FAT.WARNING similarity index 100% rename from lxdialog/BIG.FAT.WARNING rename to libs/lxdialog/BIG.FAT.WARNING diff --git a/lxdialog/Makefile.am b/libs/lxdialog/Makefile.am similarity index 100% rename from lxdialog/Makefile.am rename to libs/lxdialog/Makefile.am diff --git a/lxdialog/checklist.c b/libs/lxdialog/checklist.c similarity index 100% rename from lxdialog/checklist.c rename to libs/lxdialog/checklist.c diff --git a/lxdialog/dialog.h b/libs/lxdialog/dialog.h similarity index 100% rename from lxdialog/dialog.h rename to libs/lxdialog/dialog.h diff --git a/lxdialog/inputbox.c b/libs/lxdialog/inputbox.c similarity index 100% rename from lxdialog/inputbox.c rename to libs/lxdialog/inputbox.c diff --git a/lxdialog/menubox.c b/libs/lxdialog/menubox.c similarity index 100% rename from lxdialog/menubox.c rename to libs/lxdialog/menubox.c diff --git a/lxdialog/textbox.c b/libs/lxdialog/textbox.c similarity index 100% rename from lxdialog/textbox.c rename to libs/lxdialog/textbox.c diff --git a/lxdialog/util.c b/libs/lxdialog/util.c similarity index 100% rename from lxdialog/util.c rename to libs/lxdialog/util.c diff --git a/lxdialog/yesno.c b/libs/lxdialog/yesno.c similarity index 100% rename from lxdialog/yesno.c rename to libs/lxdialog/yesno.c diff --git a/parser/Makefile.am b/libs/parser/Makefile.am similarity index 100% rename from parser/Makefile.am rename to libs/parser/Makefile.am diff --git a/parser/confdata.c b/libs/parser/confdata.c similarity index 100% rename from parser/confdata.c rename to libs/parser/confdata.c diff --git a/parser/expr.c b/libs/parser/expr.c similarity index 100% rename from parser/expr.c rename to libs/parser/expr.c diff --git a/parser/expr.h b/libs/parser/expr.h similarity index 100% rename from parser/expr.h rename to libs/parser/expr.h diff --git a/parser/hconf.gperf b/libs/parser/hconf.gperf similarity index 100% rename from parser/hconf.gperf rename to libs/parser/hconf.gperf diff --git a/parser/lconf.l b/libs/parser/lconf.l similarity index 100% rename from parser/lconf.l rename to libs/parser/lconf.l diff --git a/parser/lkc.h b/libs/parser/lkc.h similarity index 100% rename from parser/lkc.h rename to libs/parser/lkc.h diff --git a/parser/lkc_proto.h b/libs/parser/lkc_proto.h similarity index 100% rename from parser/lkc_proto.h rename to libs/parser/lkc_proto.h diff --git a/parser/menu.c b/libs/parser/menu.c similarity index 100% rename from parser/menu.c rename to libs/parser/menu.c diff --git a/parser/symbol.c b/libs/parser/symbol.c similarity index 100% rename from parser/symbol.c rename to libs/parser/symbol.c diff --git a/parser/util.c b/libs/parser/util.c similarity index 100% rename from parser/util.c rename to libs/parser/util.c diff --git a/parser/yconf.y b/libs/parser/yconf.y similarity index 100% rename from parser/yconf.y rename to libs/parser/yconf.y -- 2.39.5