Split declarations between several header files.

* Makefile.am (SUBDIRS): Add include
* am/grecs.m4 (GRECS_INCLUDES): Update
(GRECS_COND_BUILD_INSTALL)
(GRECS_COND_BUILD_SHARED)
(GRECS_COND_BUILD_STATIC): New conditions.
Build include/Makefile and include/grecs/Makefile.
* configure.ac: Use src/grecs-gram.y as a source
validity marker
* include/Makefile.a: New file.

* src/grecs.hin: Remove.  Split into include/*.  See below.

* include/grecs.h: New file.
* include/grecs/.gitignore: New file.
* include/grecs/Makefile.am: New file.
* include/grecs/doc.h: New file.
* include/grecs/error.h: New file.
* include/grecs/format.h: New file.
* include/grecs/lex.h: New file.
* include/grecs/list.h: New file.
* include/grecs/mem.h: New file.
* include/grecs/node.h: New file.
* include/grecs/parser.h: New file.
* include/grecs/preproc.h: New file.
* include/grecs/sockaddr.h: New file.
* include/grecs/symtab.h: New file.
* include/grecs/table.h: New file.
* include/grecs/tree.h: New file.
* include/grecs/txtacc.h: New file.
* include/grecs/types.h.in: New file.
* include/grecs/util.h: New file.
* include/grecs/value.h: New file.
* include/grecs/version.h: New file.

* src/grecs-locus.h: Move to ...
* include/grecs/locus.h: ... here

* src/grecsopt.h: Move to ...
* include/grecs/opt.h: ... here

* src/json.h: Move to ...
* include/grecs/json.h: ... here

* src/wordsplit.h: Move to ...
* include/wordsplit.h: ... here

* src/Make-inst.am (include_HEADERS): Remove.
* src/Make-shared.am (grecsinclude_HEADERS)
(noinst_HEADERS): Remove.
* src/Make-static.am (noinst_HEADERS): Remove.
* src/Make.am: Remove header-related stuff

* src/bind-gram.y: Fix includes.
* src/bind-lex.l: Likewise.
* src/cidr.c: Likewise.
* src/dhcpd-gram.y: Likewise.
* src/dhcpd-lex.l: Likewise.
* src/diag.c: Likewise.
* src/format.c: Likewise.
* src/grecs-gram.y: Likewise.
* src/grecs-lex.l: Likewise.
* src/json-gram.y: Likewise.
* src/json-lex.l: Likewise.
* src/jsonfmt.c: Likewise.
* src/lookup.c: Likewise.
* src/meta1-gram.y: Likewise.
* src/meta1-lex.l: Likewise.
* src/opthelp.c: Likewise.
* src/preproc.c: Likewise.
* src/sockaddr.c: Likewise.
* src/txtacc.c: Likewise.
* src/version.c: Likewise.
* tests/gcfenum.c: Likewise.
* tests/gcffmt.c: Likewise.
* tests/gcfpeek.c: Likewise.
* tests/gcfset.c: Likewise.
* tests/gcfver.c: Likewise.
* tests/json.c: Likewise.

60 files changed, 1067 insertions, 629 deletions

diff --git a/Makefile.am b/Makefile.am
index e499bb4..3eaa8df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
 # along with Grecs.  If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I am
-SUBDIRS=. src @GRECS_TESTDIR@ @GRECS_DOCDIR@
+SUBDIRS=. include src @GRECS_TESTDIR@ @GRECS_DOCDIR@
 EXTRA_DIST=build-aux/yyrename @GRECS_BUILD_AUX@ @GRECS_DISTDOC@ gitid.h
 
 noinst_HEADERS = gitid.h
diff --git a/am/grecs.m4 b/am/grecs.m4
index 74b7840..60244a1 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -202,13 +202,14 @@ AC_DEFUN([GRECS_SETUP],[
   AC_SUBST([GRECS_CHANGELOG])
   AC_SUBST([GRECS_DISTCK_AT])
   AC_SUBST([GRECS_README])
-  AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[src] [-I$(top_builddir)/]grecsdir[src]')
+  AC_SUBST([GRECS_INCLUDES],['-I$(top_srcdir)/]grecsdir[include] [-I$(top_builddir)/]grecsdir[include]')
   AC_SUBST([GRECS_HOST_PROJECT_INCLUDES])
   AC_SUBST([GRECS_DISTDOC])
   AC_SUBST([GRECS_INCLUDE_DIR],['$(pkgincludedir)'])
-  
+
   _GRECS_OPTION_SWITCH([install],[
     LT_INIT
+    GRECS_BUILD_TYPE=install
     GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
     GRECS_DOCDIR='doc'
     GRECS_CHANGELOG=
@@ -218,18 +219,27 @@ AC_DEFUN([GRECS_SETUP],[
                     grecsdir[doc/Makefile])
   ],[shared],[
     LT_INIT
+    GRECS_BUILD_TYPE=shared
     GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.la']
     GRECS_CHANGELOG='#'
     GRECS_README=README.submodule
     _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
     AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-shared.in])
   ],[
+    GRECS_BUILD_TYPE=static
     GRECS_LDADD=['$(top_builddir)/]grecsdir[src/libgrecs.a']
     GRECS_CHANGELOG='#'
     GRECS_README=README.submodule
     _GRECS_IF_OPTION_SET([syntax-doc],[GRECS_DISTDOC=doc/grecs-syntax.texi])
     AC_CONFIG_FILES(grecsdir[src/Makefile]:grecsdir[src/Make-static.in])
   ])
-  AC_CONFIG_FILES(grecsdir[Makefile] grecsdir[src/grecs.h]:grecsdir[src/grecs.hin])
+  AM_CONDITIONAL([GRECS_COND_BUILD_INSTALL],[test $GRECS_BUILD_TYPE = install])
+  AM_CONDITIONAL([GRECS_COND_BUILD_SHARED],[test $GRECS_BUILD_TYPE = shared])
+  AM_CONDITIONAL([GRECS_COND_BUILD_STATIC],[test $GRECS_BUILD_TYPE = static])
+
+  AC_CONFIG_FILES(grecsdir[Makefile]
+                  grecsdir[include/Makefile]
+                  grecsdir[include/grecs/Makefile]
+             grecsdir[include/grecs/types.h]:grecsdir[include/grecs/types.h.in])
   m4_popdef([grecsdir])
 ])
diff --git a/configure.ac b/configure.ac
index b923c9b..6ffa55b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_PREREQ(2.63)
 AC_INIT([libgrecs], [1.0], [gray+grecs@gnu.org.ua])
-AC_CONFIG_SRCDIR([src/grecs.hin])
+AC_CONFIG_SRCDIR([src/grecs-gram.y])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.11 gnu tar-ustar dist-xz std-options silent-rules])
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..21a51e7
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,19 @@
+SUBDIRS = grecs
+GRECS_HDR = grecs.h wordsplit.h
+
+if GRECS_COND_BUILD_INSTALL
+  include_HEADERS = $(GRECS_HDR)
+endif
+
+if GRECS_COND_BUILD_SHARED
+  if GRECS_COND_INSTALLHEADERS
+    grecsincludedir = @GRECS_INCLUDE_DIR@
+    grecsinclude_HEADERS = $(GRECS_HDR)
+  else 
+    noinst_HEADERS = $(GRECS_HDR)
+  endif
+endif
+
+if GRECS_COND_BUILD_STATIC
+  noinst_HEADERS = $(GRECS_HDR)
+endif
diff --git a/include/grecs.h b/include/grecs.h
new file mode 100644
index 0000000..eac11d4
--- /dev/null
+++ b/include/grecs.h
@@ -0,0 +1,40 @@
+/* grecs - Gray's Extensible Configuration System -*- c -*-
+   Copyright (C) 2007-2016 Sergey Poznyakoff
+
+   Grecs 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 of the License, or (at your
+   option) any later version.
+
+   Grecs 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 Grecs. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef _GRECS_H
+#define _GRECS_H
+
+#include <grecs/types.h>
+#include <grecs/version.h>
+#include <grecs/doc.h>
+#include <grecs/error.h>
+#include <grecs/format.h>