Move public header files to include/gc in source tree

Also, include/extra public header files (for the redirection) are
moved to include directory.

This is have the same directories structure of public headers in the
source tree as that of the installed "include" directory.

* doc/finalization.md: Remove "include/" prefix for cord.h.
* LICENSE: Rename include/gc_allocator.h to gc/gc_allocator.h.
* Makefile.direct (CORD_SRCS, CORD_INCLUDE_FILES): Add "gc/" prefix
for cord.h, ec.h, cord_pos.h.
* CMakeLists.txt [install_headers]: Likewise.
* cord/cord.am (pkginclude_HEADERS): Likewise.
* Makefile.direct (SRCS, tests/test.o, dyn_load.o, dyn_load_sunos53.o,
mark.o, typd_mlc.o, finalize.o, ptr_chck.o, specific.o, alloc.o,
pthread_support.o, thread_local_alloc.o, win32_threads.o): Add "gc/"
prefix for gc_typed.h, gc_tiny_fl.h, gc_version.h, gc_inline.h,
gc_mark.h, gc_disclaim.h, gc_allocator.h, javaxfc.h, gc_backptr.h,
gc_gcj.h, leak_detector.h, gc_pthread_redirects.h, gc_config_macros.h.
* NT_MAKEFILE (test.obj): Add gc\ prefix for gc_mark.h, gc_disclaim.h.
* NT_MAKEFILE (cord\tests\de.obj, cord\tests\de_win.obj): Add gc\
prefix for cord.h, cord_pos.h.
* OS2_MAKEFILE (cord\cordbscs.obj, cord\cordxtra.obj,
cord\cordprnt.obj, cordtest.exe): Likewise.
* cord/cordbscs.c: Add "gc/" prefix in include for cord.h, ec.h;
reorder includes.
* cord/cordprnt.c: Likewise.
* cord/cordxtra.c: Likewise.
* cord/tests/cordtest.c: Likewise.
* cord/tests/de.c: Likewise.
* cord/tests/de_win.c: Likewise.
* extra/gc.c: Add "gc/" prefix in include for gc_inline.h,
gc_pthread_redirects.h, javaxfc.h, gc_disclaim.h, gc_gcj.h,
gc_backptr.h, gc_mark.h, gc_tiny_fl.h, leak_detector.h., gc_typed.h.
* finalize.c: Likewise.
* fnlz_mlc.c: Likewise.
* gcj_mlc.c: Likewise.
* include/private/dbg_mlc.h: Likewise.
* include/private/gc_pmark.h: Likewise.
* include/private/gc_priv.h: Likewise.
* include/private/thread_local_alloc.h: Likewise.
* malloc.c: Likewise.
* mallocx.c: Likewise.
* pthread_stop_world.c: Likewise.
* pthread_support.c: Likewise.
* reclaim.c: Likewise.
* tests/disclaim_bench.c: Likewise.
* tests/disclaim_test.c: Likewise.
* tests/disclaim_weakmap_test.c: Likewise.
* tests/leak_test.c: Likewise.
* tests/staticrootstest.c: Likewise.
* tests/test.c: Likewise.
* tests/thread_leak_test.c: Likewise.
* tests/trace_test.c: Likewise.
* thread_local_alloc.c: Likewise.
* typd_mlc.c: Likewise.
* tests/test_cpp.cc: Add "gc/" prefix in include for gc_allocator.h.
* include/extra/gc.h: Move to include folder; replace include<> to
include "".
* include/extra/gc_cpp.h: Likewise.
* include/cord.h: Move to include/gc folder.
* include/cord_pos.h: Likewise.
* include/ec.h: Likewise.
* include/gc.h: Likewise.
* include/gc_allocator.h: Likewise.
* include/gc_backptr.h: Likewise.
* include/gc_config_macros.h: Likewise.
* include/gc_cpp.h: Likewise.
* include/gc_disclaim.h: Likewise.
* include/gc_gcj.h: Likewise.
* include/gc_inline.h: Likewise.
* include/gc_mark.h: Likewise.
* include/gc_pthread_redirects.h: Likewise.
* include/gc_tiny_fl.h: Likewise.
* include/gc_typed.h: Likewise.
* include/gc_version.h: Likewise.
* include/javaxfc.h: Likewise.
* include/leak_detector.h: Likewise.
* include/include.am (pkginclude_HEADERS): Add "gc/" prefix for gc.h,
gc_backptr.h, gc_config_macros.h, gc_inline.h, gc_mark.h, gc_tiny_fl.h,
gc_typed.h, gc_version.h, javaxfc.h, leak_detector.h, gc_disclaim.h,
gc_gcj.h, gc_pthread_redirects.h, gc_allocator.h, gc_cpp.h.
* CMakeLists.txt [install_headers]: Likewise.
* include/include.am (include_HEADERS): Remove "extra/" prefix for
gc_cpp.h, gc.h.
* CMakeLists.txt [install_headers]: Likewise.

7 files changed, 15 insertions, 14 deletions

diff --git a/cord/cord.am b/cord/cord.am
index 867cea6d..045f840c 100644
--- a/cord/cord.am
+++ b/cord/cord.am
@@ -35,6 +35,6 @@ EXTRA_DIST += \
         cord/tests/de_win.rc
 
 pkginclude_HEADERS += \
-        include/cord.h \
-        include/cord_pos.h \
-        include/ec.h
+        include/gc/cord.h \
+        include/gc/cord_pos.h \
+        include/gc/ec.h
diff --git a/cord/cordbscs.c b/cord/cordbscs.c
index 1b4ec28b..5fd1e9cc 100644
--- a/cord/cordbscs.c
+++ b/cord/cordbscs.c
@@ -18,12 +18,13 @@
 # define CORD_BUILD
 #endif
 
-# include "gc.h"
-# include "cord.h"
 # include <stdlib.h>
 # include <stdio.h>
 # include <string.h>
 
+#include "gc.h"
+#include "gc/cord.h"
+
 /* An implementation of the cord primitives.  These are the only        */
 /* Functions that understand the representation.  We perform only       */
 /* minimal checks on arguments to these functions.  Out of bounds       */
diff --git a/cord/cordprnt.c b/cord/cordprnt.c
index 6095536b..c2ea45ed 100644
--- a/cord/cordprnt.c
+++ b/cord/cordprnt.c
@@ -29,8 +29,8 @@
 # define CORD_BUILD
 #endif
 
-#include "cord.h"
-#include "ec.h"
+#include "gc/cord.h"
+#include "gc/ec.h"
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/cord/cordxtra.c b/cord/cordxtra.c
index b1694c26..3771997e 100644
--- a/cord/cordxtra.c
+++ b/cord/cordxtra.c
@@ -29,8 +29,8 @@
 # include <stdlib.h>
 # include <stdarg.h>
 
-# include "cord.h"
-# include "ec.h"
+#include "gc/cord.h"
+#include "gc/ec.h"
 
 # define I_HIDE_POINTERS    /* So we get access to allocation lock. */
                 /* We use this for lazy file reading,   */
diff --git a/cord/tests/cordtest.c b/cord/tests/cordtest.c
index a41600c0..16362973 100644
--- a/cord/tests/cordtest.c
+++ b/cord/tests/cordtest.c
@@ -11,14 +11,14 @@
  * modified is included with the above copyright notice.
  */
 
-# include "gc.h"    /* For GC_INIT() only */
-# include "cord.h"
-
 # include <stdarg.h>
 # include <string.h>
 # include <stdio.h>
 # include <stdlib.h>
 
+#include "gc.h"    /* For GC_INIT() only */
+#include "gc/cord.h"
+
 /* This is a very incomplete test of the cord package.  It knows about  */
 /* a few internals of the package (e.g. when C strings are returned)    */
 /* that real clients shouldn't rely on.                                 */
diff --git a/cord/tests/de.c b/cord/tests/de.c
index 9f554d19..4a30863b 100644
--- a/cord/tests/de.c
+++ b/cord/tests/de.c
@@ -30,7 +30,7 @@
 #include <stdlib.h> /* for exit() */
 
 #include "gc.h"
-#include "cord.h"
+#include "gc/cord.h"
 
 #ifdef THINK_C
 #define MACINTOSH
diff --git a/cord/tests/de_win.c b/cord/tests/de_win.c
index 82f4c71d..878cae2a 100644
--- a/cord/tests/de_win.c
+++ b/cord/tests/de_win.c
@@ -28,7 +28,7 @@
 #include <windows.h>
 
 #include "gc.h"
-#include "cord.h"
+#include "gc/cord.h"
 #include "de_cmds.h"
 #include "de_win.h"