From 4f11e4b665c914efb1abee51b82a5fe4a0d43f9a Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Thu, 7 Jan 2010 01:31:17 +0200 Subject: [PATCH] Massive moved some dirs from $(srcdir)/src into $(srcdir)/lib Moved subdirs: * filehighlight * mcconfig * search * skin * tty Signed-off-by: Slava Zanko --- configure.ac | 10 +++++----- lib/Makefile.am | 13 +++++++++---- {src => lib}/filehighlight/Makefile.am | 0 {src => lib}/filehighlight/common.c | 0 {src => lib}/filehighlight/fhl.h | 0 {src => lib}/filehighlight/get-color.c | 0 {src => lib}/filehighlight/ini-file-read.c | 0 {src => lib}/filehighlight/internal.h | 0 {src => lib}/mcconfig/Makefile.am | 0 {src => lib}/mcconfig/common.c | 0 {src => lib}/mcconfig/get.c | 0 {src => lib}/mcconfig/mcconfig.h | 0 {src => lib}/mcconfig/set.c | 0 {src => lib}/search/Makefile.am | 0 {src => lib}/search/glob.c | 0 {src => lib}/search/hex.c | 0 {src => lib}/search/internal.h | 0 {src => lib}/search/lib.c | 0 {src => lib}/search/normal.c | 0 {src => lib}/search/regex.c | 0 {src => lib}/search/search.c | 0 {src => lib}/search/search.h | 0 {src => lib}/skin/Makefile.am | 0 {src => lib}/skin/colors-old.c | 0 {src => lib}/skin/colors.c | 0 {src => lib}/skin/common.c | 0 {src => lib}/skin/hc-skins.c | 0 {src => lib}/skin/ini-file.c | 0 {src => lib}/skin/internal.h | 0 {src => lib}/skin/lines.c | 0 {src => lib}/skin/skin.h | 0 {src => lib}/tty/Makefile.am | 0 {src => lib}/tty/color-internal.c | 0 {src => lib}/tty/color-internal.h | 0 {src => lib}/tty/color-ncurses.c | 0 {src => lib}/tty/color-slang.c | 0 {src => lib}/tty/color-slang.h | 0 {src => lib}/tty/color.c | 0 {src => lib}/tty/color.h | 0 {src => lib}/tty/key.c | 0 {src => lib}/tty/key.h | 0 {src => lib}/tty/keyxdef.c | 0 {src => lib}/tty/mouse.c | 0 {src => lib}/tty/mouse.h | 0 {src => lib}/tty/tty-internal.h | 0 {src => lib}/tty/tty-ncurses.c | 0 {src => lib}/tty/tty-ncurses.h | 0 {src => lib}/tty/tty-slang.c | 0 {src => lib}/tty/tty-slang.h | 0 {src => lib}/tty/tty.c | 0 {src => lib}/tty/tty.h | 0 {src => lib}/tty/win.c | 0 {src => lib}/tty/win.h | 0 {src => lib}/tty/x11conn.c | 0 {src => lib}/tty/x11conn.h | 0 src/Makefile.am | 7 +------ 56 files changed, 15 insertions(+), 15 deletions(-) rename {src => lib}/filehighlight/Makefile.am (100%) rename {src => lib}/filehighlight/common.c (100%) rename {src => lib}/filehighlight/fhl.h (100%) rename {src => lib}/filehighlight/get-color.c (100%) rename {src => lib}/filehighlight/ini-file-read.c (100%) rename {src => lib}/filehighlight/internal.h (100%) rename {src => lib}/mcconfig/Makefile.am (100%) rename {src => lib}/mcconfig/common.c (100%) rename {src => lib}/mcconfig/get.c (100%) rename {src => lib}/mcconfig/mcconfig.h (100%) rename {src => lib}/mcconfig/set.c (100%) rename {src => lib}/search/Makefile.am (100%) rename {src => lib}/search/glob.c (100%) rename {src => lib}/search/hex.c (100%) rename {src => lib}/search/internal.h (100%) rename {src => lib}/search/lib.c (100%) rename {src => lib}/search/normal.c (100%) rename {src => lib}/search/regex.c (100%) rename {src => lib}/search/search.c (100%) rename {src => lib}/search/search.h (100%) rename {src => lib}/skin/Makefile.am (100%) rename {src => lib}/skin/colors-old.c (100%) rename {src => lib}/skin/colors.c (100%) rename {src => lib}/skin/common.c (100%) rename {src => lib}/skin/hc-skins.c (100%) rename {src => lib}/skin/ini-file.c (100%) rename {src => lib}/skin/internal.h (100%) rename {src => lib}/skin/lines.c (100%) rename {src => lib}/skin/skin.h (100%) rename {src => lib}/tty/Makefile.am (100%) rename {src => lib}/tty/color-internal.c (100%) rename {src => lib}/tty/color-internal.h (100%) rename {src => lib}/tty/color-ncurses.c (100%) rename {src => lib}/tty/color-slang.c (100%) rename {src => lib}/tty/color-slang.h (100%) rename {src => lib}/tty/color.c (100%) rename {src => lib}/tty/color.h (100%) rename {src => lib}/tty/key.c (100%) rename {src => lib}/tty/key.h (100%) rename {src => lib}/tty/keyxdef.c (100%) rename {src => lib}/tty/mouse.c (100%) rename {src => lib}/tty/mouse.h (100%) rename {src => lib}/tty/tty-internal.h (100%) rename {src => lib}/tty/tty-ncurses.c (100%) rename {src => lib}/tty/tty-ncurses.h (100%) rename {src => lib}/tty/tty-slang.c (100%) rename {src => lib}/tty/tty-slang.h (100%) rename {src => lib}/tty/tty.c (100%) rename {src => lib}/tty/tty.h (100%) rename {src => lib}/tty/win.c (100%) rename {src => lib}/tty/win.h (100%) rename {src => lib}/tty/x11conn.c (100%) rename {src => lib}/tty/x11conn.h (100%) diff --git a/configure.ac b/configure.ac index 80713d466..75bebd211 100644 --- a/configure.ac +++ b/configure.ac @@ -576,14 +576,14 @@ misc/mc.ext src/Makefile src/editor/Makefile -src/filehighlight/Makefile -src/mcconfig/Makefile -src/search/Makefile -src/skin/Makefile -src/tty/Makefile src/viewer/Makefile lib/Makefile +lib/filehighlight/Makefile +lib/mcconfig/Makefile +lib/search/Makefile +lib/skin/Makefile +lib/tty/Makefile lib/vfs/Makefile lib/vfs/mc-vfs/Makefile lib/vfs/mc-vfs/extfs/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index da138e02d..4b1e14e76 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = vfs +SUBDIRS = filehighlight mcconfig search skin tty vfs noinst_LTLIBRARIES = libmc.la @@ -6,12 +6,17 @@ libmc_la_SOURCES = libmc_la_CFLAGS= -libmc_la_LIBADD = +libmc_la_LIBADD = \ + filehighlight/libmcfilehighlight.la \ + mcconfig/libmcconfig.la \ + search/libsearch.la \ + skin/libmcskin.la \ + tty/libmctty.la if ENABLE_VFS -libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.a +libmc_la_LIBADD+= vfs/mc-vfs/libvfs-mc.a if USE_SAMBA_FS -libmc_la_LIBADD += vfs/mc-vfs/samba/libsamba.a +libmc_la_LIBADD+= vfs/mc-vfs/samba/libsamba.a endif endif diff --git a/src/filehighlight/Makefile.am b/lib/filehighlight/Makefile.am similarity index 100% rename from src/filehighlight/Makefile.am rename to lib/filehighlight/Makefile.am diff --git a/src/filehighlight/common.c b/lib/filehighlight/common.c similarity index 100% rename from src/filehighlight/common.c rename to lib/filehighlight/common.c diff --git a/src/filehighlight/fhl.h b/lib/filehighlight/fhl.h similarity index 100% rename from src/filehighlight/fhl.h rename to lib/filehighlight/fhl.h diff --git a/src/filehighlight/get-color.c b/lib/filehighlight/get-color.c similarity index 100% rename from src/filehighlight/get-color.c rename to lib/filehighlight/get-color.c diff --git a/src/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c similarity index 100% rename from src/filehighlight/ini-file-read.c rename to lib/filehighlight/ini-file-read.c diff --git a/src/filehighlight/internal.h b/lib/filehighlight/internal.h similarity index 100% rename from src/filehighlight/internal.h rename to lib/filehighlight/internal.h diff --git a/src/mcconfig/Makefile.am b/lib/mcconfig/Makefile.am similarity index 100% rename from src/mcconfig/Makefile.am rename to lib/mcconfig/Makefile.am diff --git a/src/mcconfig/common.c b/lib/mcconfig/common.c similarity index 100% rename from src/mcconfig/common.c rename to lib/mcconfig/common.c diff --git a/src/mcconfig/get.c b/lib/mcconfig/get.c similarity index 100% rename from src/mcconfig/get.c rename to lib/mcconfig/get.c diff --git a/src/mcconfig/mcconfig.h b/lib/mcconfig/mcconfig.h similarity index 100% rename from src/mcconfig/mcconfig.h rename to lib/mcconfig/mcconfig.h diff --git a/src/mcconfig/set.c b/lib/mcconfig/set.c similarity index 100% rename from src/mcconfig/set.c rename to lib/mcconfig/set.c diff --git a/src/search/Makefile.am b/lib/search/Makefile.am similarity index 100% rename from src/search/Makefile.am rename to lib/search/Makefile.am diff --git a/src/search/glob.c b/lib/search/glob.c similarity index 100% rename from src/search/glob.c rename to lib/search/glob.c diff --git a/src/search/hex.c b/lib/search/hex.c similarity index 100% rename from src/search/hex.c rename to lib/search/hex.c diff --git a/src/search/internal.h b/lib/search/internal.h similarity index 100% rename from src/search/internal.h rename to lib/search/internal.h diff --git a/src/search/lib.c b/lib/search/lib.c similarity index 100% rename from src/search/lib.c rename to lib/search/lib.c diff --git a/src/search/normal.c b/lib/search/normal.c similarity index 100% rename from src/search/normal.c rename to lib/search/normal.c diff --git a/src/search/regex.c b/lib/search/regex.c similarity index 100% rename from src/search/regex.c rename to lib/search/regex.c diff --git a/src/search/search.c b/lib/search/search.c similarity index 100% rename from src/search/search.c rename to lib/search/search.c diff --git a/src/search/search.h b/lib/search/search.h similarity index 100% rename from src/search/search.h rename to lib/search/search.h diff --git a/src/skin/Makefile.am b/lib/skin/Makefile.am similarity index 100% rename from src/skin/Makefile.am rename to lib/skin/Makefile.am diff --git a/src/skin/colors-old.c b/lib/skin/colors-old.c similarity index 100% rename from src/skin/colors-old.c rename to lib/skin/colors-old.c diff --git a/src/skin/colors.c b/lib/skin/colors.c similarity index 100% rename from src/skin/colors.c rename to lib/skin/colors.c diff --git a/src/skin/common.c b/lib/skin/common.c similarity index 100% rename from src/skin/common.c rename to lib/skin/common.c diff --git a/src/skin/hc-skins.c b/lib/skin/hc-skins.c similarity index 100% rename from src/skin/hc-skins.c rename to lib/skin/hc-skins.c diff --git a/src/skin/ini-file.c b/lib/skin/ini-file.c similarity index 100% rename from src/skin/ini-file.c rename to lib/skin/ini-file.c diff --git a/src/skin/internal.h b/lib/skin/internal.h similarity index 100% rename from src/skin/internal.h rename to lib/skin/internal.h diff --git a/src/skin/lines.c b/lib/skin/lines.c similarity index 100% rename from src/skin/lines.c rename to lib/skin/lines.c diff --git a/src/skin/skin.h b/lib/skin/skin.h similarity index 100% rename from src/skin/skin.h rename to lib/skin/skin.h diff --git a/src/tty/Makefile.am b/lib/tty/Makefile.am similarity index 100% rename from src/tty/Makefile.am rename to lib/tty/Makefile.am diff --git a/src/tty/color-internal.c b/lib/tty/color-internal.c similarity index 100% rename from src/tty/color-internal.c rename to lib/tty/color-internal.c diff --git a/src/tty/color-internal.h b/lib/tty/color-internal.h similarity index 100% rename from src/tty/color-internal.h rename to lib/tty/color-internal.h diff --git a/src/tty/color-ncurses.c b/lib/tty/color-ncurses.c similarity index 100% rename from src/tty/color-ncurses.c rename to lib/tty/color-ncurses.c diff --git a/src/tty/color-slang.c b/lib/tty/color-slang.c similarity index 100% rename from src/tty/color-slang.c rename to lib/tty/color-slang.c diff --git a/src/tty/color-slang.h b/lib/tty/color-slang.h similarity index 100% rename from src/tty/color-slang.h rename to lib/tty/color-slang.h diff --git a/src/tty/color.c b/lib/tty/color.c similarity index 100% rename from src/tty/color.c rename to lib/tty/color.c diff --git a/src/tty/color.h b/lib/tty/color.h similarity index 100% rename from src/tty/color.h rename to lib/tty/color.h diff --git a/src/tty/key.c b/lib/tty/key.c similarity index 100% rename from src/tty/key.c rename to lib/tty/key.c diff --git a/src/tty/key.h b/lib/tty/key.h similarity index 100% rename from src/tty/key.h rename to lib/tty/key.h diff --git a/src/tty/keyxdef.c b/lib/tty/keyxdef.c similarity index 100% rename from src/tty/keyxdef.c rename to lib/tty/keyxdef.c diff --git a/src/tty/mouse.c b/lib/tty/mouse.c similarity index 100% rename from src/tty/mouse.c rename to lib/tty/mouse.c diff --git a/src/tty/mouse.h b/lib/tty/mouse.h similarity index 100% rename from src/tty/mouse.h rename to lib/tty/mouse.h diff --git a/src/tty/tty-internal.h b/lib/tty/tty-internal.h similarity index 100% rename from src/tty/tty-internal.h rename to lib/tty/tty-internal.h diff --git a/src/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c similarity index 100% rename from src/tty/tty-ncurses.c rename to lib/tty/tty-ncurses.c diff --git a/src/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h similarity index 100% rename from src/tty/tty-ncurses.h rename to lib/tty/tty-ncurses.h diff --git a/src/tty/tty-slang.c b/lib/tty/tty-slang.c similarity index 100% rename from src/tty/tty-slang.c rename to lib/tty/tty-slang.c diff --git a/src/tty/tty-slang.h b/lib/tty/tty-slang.h similarity index 100% rename from src/tty/tty-slang.h rename to lib/tty/tty-slang.h diff --git a/src/tty/tty.c b/lib/tty/tty.c similarity index 100% rename from src/tty/tty.c rename to lib/tty/tty.c diff --git a/src/tty/tty.h b/lib/tty/tty.h similarity index 100% rename from src/tty/tty.h rename to lib/tty/tty.h diff --git a/src/tty/win.c b/lib/tty/win.c similarity index 100% rename from src/tty/win.c rename to lib/tty/win.c diff --git a/src/tty/win.h b/lib/tty/win.h similarity index 100% rename from src/tty/win.h rename to lib/tty/win.h diff --git a/src/tty/x11conn.c b/lib/tty/x11conn.c similarity index 100% rename from src/tty/x11conn.c rename to lib/tty/x11conn.c diff --git a/src/tty/x11conn.h b/lib/tty/x11conn.h similarity index 100% rename from src/tty/x11conn.h rename to lib/tty/x11conn.h diff --git a/src/Makefile.am b/src/Makefile.am index e11c24c22..33993d080 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = mcconfig search tty viewer filehighlight skin +SUBDIRS = viewer if USE_EDIT SUBDIRS += editor @@ -50,11 +50,6 @@ endif mc_LDADD = \ ../lib/libmc.la \ $(EDITLIB) \ - filehighlight/libmcfilehighlight.la \ - mcconfig/libmcconfig.la \ - search/libsearch.la \ - skin/libmcskin.la \ - tty/libmctty.la \ viewer/libmcviewer.la \ $(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS) -- 2.11.4.GIT