Rearrange the directory structure

Sources for the libgdbm library reside in src/.
Sources for building accompanying tools are moved to the tools/
subdirectory.

33 files changed, 107 insertions, 88 deletions

diff --git a/.gitignore b/.gitignore
index ffc6ef1..d92fbbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *.cflow
 .deps
 .emacs*
+.gdbinit
 .libs
 ABOUT-NLS
 ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 25e200d..77c93ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = build-aux/config.rpath NOTE-WARNING
 if COMPAT_OPT
   MAYBE_COMPAT = compat
 endif
-SUBDIRS = po src doc $(MAYBE_COMPAT) tests
+SUBDIRS = po src tools doc $(MAYBE_COMPAT) tests
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-libgdbm-compat
 
diff --git a/configure.ac b/configure.ac
index 8648ad0..a59ad5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,6 +275,7 @@ status_ficlone=$status_ficlone])
 AC_CONFIG_FILES([Makefile
                  src/Makefile
 		 src/gdbm.h
+		 tools/Makefile
 		 doc/Makefile
 		 compat/Makefile])
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ae3c0d2..fc505a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,21 +15,22 @@
 # along with GDBM. If not, see <http://www.gnu.org/licenses/>.
 
 src/bucket.c
-src/datconv.c
 src/falloc.c
 src/findkey.c
-src/gdbm_dump.c
-src/gdbm_load.c
 src/gdbmerrno.c
-src/gdbmshell.c
 src/gdbmstore.c
-src/gdbmtool.c
-src/gram.y
-src/input-file.c
-src/lex.l
-src/parseopt.c
 src/recover.c
 src/update.c
-src/util.c
-src/var.c
+
+tools/datconv.c
+tools/gdbm_dump.c
+tools/gdbm_load.c
+tools/gdbmshell.c
+tools/gdbmtool.c
+tools/gram.y
+tools/input-file.c
+tools/lex.l
+tools/parseopt.c
+tools/util.c
+tools/var.c
 
diff --git a/src/.gitignore b/src/.gitignore
index bc1099e..8de76c3 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,14 +1 @@
-.deps
-.libs
-.gdbinit
-Makefile
-Makefile.in
 gdbm.h
-*.lo
-libgdbm.la
-gdbmtool
-gdbm_dump
-gdbm_load
-gram.[ch]
-gram.output
-lex.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 316bfcc..c088cce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,24 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with GDBM. If not, see <http://www.gnu.org/licenses/>. 
 
-# Flags
-AM_CPPFLAGS=-DIN_GDBM -DLOCALEDIR=\"$(localedir)\"
-
 # Headers
 nodist_include_HEADERS = gdbm.h
 noinst_HEADERS = \
  gdbmconst.h\
  gdbmdefs.h\
  gettext.h\
- gram.h\
  proto.h\
  systems.h
 
-EXTRA_DIST = gdbm.h.in gdbm.magic gram.y lex.l
-BUILT_SOURCES = gdbm.h gram.h gram.c lex.c
-
-gram.c gram.h: gram.y
-lex.c: lex.l
+EXTRA_DIST = gdbm.h.in gdbm.magic
+BUILT_SOURCES = gdbm.h 
 
 # The libraries
 VI_CURRENT  = 6
@@ -78,53 +71,3 @@ endif
 
 libgdbm_la_LDFLAGS = -version-info $(VI_CURRENT):$(VI_REVISION):$(VI_AGE)
 
-noinst_LIBRARIES = libgdbmapp.a
-
-libgdbmapp_a_SOURCES =\
- err.c\
- mem.c\
- gdbmapp.h\
- parseopt.c\
- progname.c\
- datconv.c\
- gram.c\
- input-argv.c\
- input-file.c\
- input-null.c\
- input-std.c\
- lex.c\
- gdbmshell.c\
- var.c\
- util.c\
- wordwrap.c
-
-if GDBM_COND_READLINE
-  libgdbmapp_a_SOURCES += input-rl.c
-endif
-
-# Programs
-bin_PROGRAMS = gdbmtool gdbm_load gdbm_dump
-
-gdbmtool_LDADD  = \
- ./libgdbmapp.a\
- ./libgdbm.la\
- @READLINE_LIBS@
-
-gdbmtool_SOURCES = \
- gdbmtool.h\
- gdbmtool.c
-
-AM_YFLAGS = -dv $(YFLAGS_DEBUG)
-AM_LFLAGS = $(LFLAGS_DEBUG)
-
-.l.c:
-	$(AM_V_GEN)$(FLEX) -o $@ $(AM_LFLAGS) $<
-.y.c:
-	$(AM_V_GEN)$(BISON) -o $@ $(AM_YFLAGS) $<
-
-if COND_GDBMTOOL_DEBUG
-  AM_CPPFLAGS += -DGDBMTOOL_DEBUG=1
-endif
-
-gdbm_load_LDADD  = ./libgdbmapp.a ./libgdbm.la 
-gdbm_dump_LDADD  = ./libgdbmapp.a ./libgdbm.la 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3bd6b83..de63cd5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -129,7 +129,7 @@ check_PROGRAMS = \
  t_wordwrap\
  $(DBMPROGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(DBMINCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/tools $(DBMINCLUDES)
 
 noinst_HEADERS=progname.h
 
@@ -140,6 +140,6 @@ dtdump_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
-t_wordwrap_LDADD = ../src/libgdbmapp.a
+t_wordwrap_LDADD = ../tools/libgdbmapp.a
 
 SUBDIRS = gdbmtool
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 43e5e18..a3643c7 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
 
-PATH=@abs_top_builddir@/src:$PATH
+PATH=@abs_top_builddir@/tools:$PATH
 
 @COMPAT_OPT_TRUE@COMPAT=1
 @COMPAT_OPT_FALSE@COMPAT=0
diff --git a/tests/gdbmtool/config/default.exp b/tests/gdbmtool/config/default.exp
index eab27ef..7376896 100644
--- a/tests/gdbmtool/config/default.exp
+++ b/tests/gdbmtool/config/default.exp
@@ -11,7 +11,7 @@ proc gdbmtool_start {args} {
     global top_builddir
     global gdbmtool_prompt
 
-    set cmd "$top_builddir/src/gdbmtool -q $args"
+    set cmd "$top_builddir/tools/gdbmtool -q $args"
     verbose "running $cmd" 1
 
     set gdbmtool_spawn_id [remote_spawn host $cmd]
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000..57e8914
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,6 @@
+gdbmtool
+gdbm_dump
+gdbm_load
+gram.[ch]
+gram.output
+lex.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..1002d92
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,80 @@
+# This file is part of GDBM.                                   -*- Makefile -*-
+# Copyright (C) 2007-2021 Free Software Foundation, Inc.
+#
+# GDBM is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GDBM is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GDBM. If not, see <http://www.gnu.org/licenses/>. 
+
+# Flags
+AM_CPPFLAGS=\
+ -DLOCALEDIR=\"$(localedir)\"\
+ -I$(top_srcdir)/src\
+ -I$(top_builddir)/src\
+ -I$(top_srcdir)/tools
+
+noinst_LIBRARIES = libgdbmapp.a
+
+libgdbmapp_a_SOURCES =\
+ err.c\
+ mem.c\
+ gdbmapp.h\
+ parseopt.c\
+ progname.c\
+ datconv.c\
+ gram.c\
+ input-argv.c\
+ input-file.c\
+ input-null.c\
+ input-std.c\
+ lex.c\
+ gdbmshell.c\
+ var.c\
+ util.c\
+ wordwrap.c
+
+if GDBM_COND_READLINE
+  libgdbmapp_a_SOURCES += input-rl.c
+endif
+
+# Programs
+bin_PROGRAMS = gdbmtool gdbm_load gdbm_dump
+
+EXTRA_DIST = gram.y lex.l
+BUILT_SOURCES = gram.h gram.c lex.c
+noinst_HEADERS =  gram.h
+
+gram.c gram.h: gram.y
+lex.c: lex.l
+
+gdbmtool_LDADD  = \
+ ./libgdbmapp.a\
+ ../src/libgdbm.la\
+ @READLINE_LIBS@
+
+gdbmtool_SOURCES = \
+ gdbmtool.h\
+ gdbmtool.c
+
+AM_YFLAGS = -dv $(YFLAGS_DEBUG)
+AM_LFLAGS = $(LFLAGS_DEBUG)
+
+.l.c:
+	$(AM_V_GEN)$(FLEX) -o $@ $(AM_LFLAGS) $<
+.y.c:
+	$(AM_V_GEN)$(BISON) -o $@ $(AM_YFLAGS) $<
+
+if COND_GDBMTOOL_DEBUG
+  AM_CPPFLAGS += -DGDBMTOOL_DEBUG=1
+endif
+
+gdbm_load_LDADD  = ./libgdbmapp.a ../src/libgdbm.la 
+gdbm_dump_LDADD  = ./libgdbmapp.a ../src/libgdbm.la 
diff --git a/src/datconv.c b/tools/datconv.c
index 4d05f11..4d05f11 100644
--- a/src/datconv.c
+++ b/tools/datconv.c
diff --git a/src/err.c b/tools/err.c
index 19ba6ef..19ba6ef 100644
--- a/src/err.c
+++ b/tools/err.c
diff --git a/src/gdbm_dump.c b/tools/gdbm_dump.c
index ada191d..ada191d 100644
--- a/src/gdbm_dump.c
+++ b/tools/gdbm_dump.c
diff --git a/src/gdbm_load.c b/tools/gdbm_load.c
index 41cb820..41cb820 100644
--- a/src/gdbm_load.c
+++ b/tools/gdbm_load.c
diff --git a/src/gdbmapp.h b/tools/gdbmapp.h
index d766358..d766358 100644
--- a/src/gdbmapp.h
+++ b/tools/gdbmapp.h
diff --git a/src/gdbmshell.c b/tools/gdbmshell.c
index 06a0d0c..06a0d0c 100644
--- a/src/gdbmshell.c
+++ b/tools/gdbmshell.c
diff --git a/src/gdbmtool.c b/tools/gdbmtool.c
index dfe7094..dfe7094 100644
--- a/src/gdbmtool.c
+++ b/tools/gdbmtool.c
diff --git a/src/gdbmtool.h b/tools/gdbmtool.h
index 432e9a6..432e9a6 100644
--- a/src/gdbmtool.h
+++ b/tools/gdbmtool.h
diff --git a/src/gdbmtool.supp b/tools/gdbmtool.supp
index 247be73..247be73 100644
--- a/src/gdbmtool.supp
+++ b/tools/gdbmtool.supp
diff --git a/src/gram.y b/tools/gram.y
index baf72af..baf72af 100644
--- a/src/gram.y
+++ b/tools/gram.y
diff --git a/src/input-argv.c b/tools/input-argv.c
index acb6544..acb6544 100644
--- a/src/input-argv.c
+++ b/tools/input-argv.c
diff --git a/src/input-file.c b/tools/input-file.c
index 0c83555..0c83555 100644
--- a/src/input-file.c
+++ b/tools/input-file.c
diff --git a/src/input-null.c b/tools/input-null.c
index 7bc95ce..7bc95ce 100644
--- a/src/input-null.c
+++ b/tools/input-null.c
diff --git a/src/input-rl.c b/tools/input-rl.c
index 6d91bd5..6d91bd5 100644
--- a/src/input-rl.c
+++ b/tools/input-rl.c
diff --git a/src/input-std.c b/tools/input-std.c
index ca3059c..ca3059c 100644
--- a/src/input-std.c
+++ b/tools/input-std.c
diff --git a/src/lex.l b/tools/lex.l
index 3d63687..3d63687 100644
--- a/src/lex.l
+++ b/tools/lex.l
diff --git a/src/mem.c b/tools/mem.c
index 8b2da75..8b2da75 100644
--- a/src/mem.c
+++ b/tools/mem.c
diff --git a/src/parseopt.c b/tools/parseopt.c
index 0169ae5..0169ae5 100644
--- a/src/parseopt.c
+++ b/tools/parseopt.c
diff --git a/src/progname.c b/tools/progname.c
index 63bbd15..63bbd15 100644
--- a/src/progname.c
+++ b/tools/progname.c
diff --git a/src/util.c b/tools/util.c
index 509524a..509524a 100644
--- a/src/util.c
+++ b/tools/util.c
diff --git a/src/var.c b/tools/var.c
index 5a1d750..5a1d750 100644
--- a/src/var.c
+++ b/tools/var.c
diff --git a/src/wordwrap.c b/tools/wordwrap.c
index 890291e..890291e 100644
--- a/src/wordwrap.c
+++ b/tools/wordwrap.c