Ticket #1866: Move edit/ and vfs/ directories into src/

Moved dir $(srcdir)/edit into $(srcdir)/src/editor Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-01-07 00:20:56 +02:00 · 2010-01-07 00:20:56 +02:00 · 871991dda0
parent c79e5939e6
commit 871991dda0
25 changed files with 7 additions and 3 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 AUTOMAKE_OPTIONS = 1.5

-SUBDIRS = intl po vfs edit src doc syntax contrib misc
+SUBDIRS = intl po vfs src doc syntax contrib misc

 EXTRA_DIST = 

--- a/configure.ac
+++ b/configure.ac
@ -575,6 +575,7 @@ misc/skins/Makefile
 misc/mc.ext

 src/Makefile
+src/editor/Makefile
 src/filehighlight/Makefile
 src/mcconfig/Makefile
 src/search/Makefile
@ -582,7 +583,6 @@ src/skin/Makefile
 src/tty/Makefile
 src/viewer/Makefile

-edit/Makefile
 syntax/Makefile

 vfs/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,5 +1,9 @@
 SUBDIRS = mcconfig search tty viewer filehighlight skin

+if USE_EDIT
+SUBDIRS += editor
+endif
+
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)

 localedir = $(datadir)/locale
@ -29,7 +33,7 @@ cons_saver_SOURCES = cons.saver.c
 man2hlp_SOURCES = man2hlp.c glibcompat.c

 if USE_EDIT
-EDITLIB = ../edit/libedit.a
+EDITLIB = editor/libedit.a
 endif

 if ENABLE_VFS
--- a/src/editor/.gitignore
+++ b/src/editor/.gitignore
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
--- a/src/editor/bookmark.c
+++ b/src/editor/bookmark.c
--- a/src/editor/choosesyntax.c
+++ b/src/editor/choosesyntax.c
--- a/src/editor/edit-impl.h
+++ b/src/editor/edit-impl.h
--- a/src/editor/edit-widget.h
+++ b/src/editor/edit-widget.h
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
--- a/src/editor/edit.h
+++ b/src/editor/edit.h
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
--- a/src/editor/editcmd_dialogs.c
+++ b/src/editor/editcmd_dialogs.c
--- a/src/editor/editcmd_dialogs.h
+++ b/src/editor/editcmd_dialogs.h
--- a/src/editor/editdraw.c
+++ b/src/editor/editdraw.c
--- a/src/editor/editkeys.c
+++ b/src/editor/editkeys.c
--- a/src/editor/editlock.c
+++ b/src/editor/editlock.c
--- a/src/editor/editlock.h
+++ b/src/editor/editlock.h
--- a/src/editor/editmenu.c
+++ b/src/editor/editmenu.c
--- a/src/editor/editoptions.c
+++ b/src/editor/editoptions.c
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
--- a/src/editor/etags.c
+++ b/src/editor/etags.c
--- a/src/editor/etags.h
+++ b/src/editor/etags.h
--- a/src/editor/syntax.c
+++ b/src/editor/syntax.c
--- a/src/editor/wordproc.c
+++ b/src/editor/wordproc.c