Massive moved some dirs from $(srcdir)/src into $(srcdir)/lib

Moved subdirs: * filehighlight * mcconfig * search * skin * tty Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-01-07 01:31:17 +02:00 · 2010-01-07 01:31:17 +02:00 · 4f11e4b665
--- 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
--- 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

--- a/lib/filehighlight/Makefile.am
+++ b/lib/filehighlight/Makefile.am
--- a/lib/filehighlight/common.c
+++ b/lib/filehighlight/common.c
--- a/lib/filehighlight/fhl.h
+++ b/lib/filehighlight/fhl.h
--- a/lib/filehighlight/get-color.c
+++ b/lib/filehighlight/get-color.c
--- a/lib/filehighlight/ini-file-read.c
+++ b/lib/filehighlight/ini-file-read.c
--- a/lib/filehighlight/internal.h
+++ b/lib/filehighlight/internal.h
--- a/lib/mcconfig/Makefile.am
+++ b/lib/mcconfig/Makefile.am
--- a/lib/mcconfig/common.c
+++ b/lib/mcconfig/common.c
--- a/lib/mcconfig/get.c
+++ b/lib/mcconfig/get.c
--- a/lib/mcconfig/mcconfig.h
+++ b/lib/mcconfig/mcconfig.h
--- a/lib/mcconfig/set.c
+++ b/lib/mcconfig/set.c
--- a/lib/search/Makefile.am
+++ b/lib/search/Makefile.am
--- a/lib/search/glob.c
+++ b/lib/search/glob.c
--- a/lib/search/hex.c
+++ b/lib/search/hex.c
--- a/lib/search/internal.h
+++ b/lib/search/internal.h
--- a/lib/search/lib.c
+++ b/lib/search/lib.c
--- a/lib/search/normal.c
+++ b/lib/search/normal.c
--- a/lib/search/regex.c
+++ b/lib/search/regex.c
--- a/lib/search/search.c
+++ b/lib/search/search.c
--- a/lib/search/search.h
+++ b/lib/search/search.h
--- a/lib/skin/Makefile.am
+++ b/lib/skin/Makefile.am
--- a/lib/skin/colors-old.c
+++ b/lib/skin/colors-old.c
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
--- a/lib/skin/common.c
+++ b/lib/skin/common.c
--- a/lib/skin/hc-skins.c
+++ b/lib/skin/hc-skins.c
--- a/lib/skin/ini-file.c
+++ b/lib/skin/ini-file.c
--- a/lib/skin/internal.h
+++ b/lib/skin/internal.h
--- a/lib/skin/lines.c
+++ b/lib/skin/lines.c
--- a/lib/skin/skin.h
+++ b/lib/skin/skin.h
--- a/lib/tty/Makefile.am
+++ b/lib/tty/Makefile.am
--- a/lib/tty/color-internal.c
+++ b/lib/tty/color-internal.c
--- a/lib/tty/color-internal.h
+++ b/lib/tty/color-internal.h
--- a/lib/tty/color-ncurses.c
+++ b/lib/tty/color-ncurses.c
--- a/lib/tty/color-slang.c
+++ b/lib/tty/color-slang.c
--- a/lib/tty/color-slang.h
+++ b/lib/tty/color-slang.h
--- a/lib/tty/color.c
+++ b/lib/tty/color.c
--- a/lib/tty/color.h
+++ b/lib/tty/color.h
--- a/lib/tty/key.c
+++ b/lib/tty/key.c
--- a/lib/tty/key.h
+++ b/lib/tty/key.h
--- a/lib/tty/keyxdef.c
+++ b/lib/tty/keyxdef.c
--- a/lib/tty/mouse.c
+++ b/lib/tty/mouse.c
--- a/lib/tty/mouse.h
+++ b/lib/tty/mouse.h
--- a/lib/tty/tty-internal.h
+++ b/lib/tty/tty-internal.h
--- a/lib/tty/tty-ncurses.c
+++ b/lib/tty/tty-ncurses.c
--- a/lib/tty/tty-ncurses.h
+++ b/lib/tty/tty-ncurses.h
--- a/lib/tty/tty-slang.c
+++ b/lib/tty/tty-slang.c
--- a/lib/tty/tty-slang.h
+++ b/lib/tty/tty-slang.h
--- a/lib/tty/tty.c
+++ b/lib/tty/tty.c
--- a/lib/tty/tty.h
+++ b/lib/tty/tty.h
--- a/lib/tty/win.c
+++ b/lib/tty/win.c
--- a/lib/tty/win.h
+++ b/lib/tty/win.h
--- a/lib/tty/x11conn.c
+++ b/lib/tty/x11conn.c
--- a/lib/tty/x11conn.h
+++ b/lib/tty/x11conn.h
--- 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)