Separate source from headers

25 files changed, 18 insertions, 49 deletions

diff --git a/zix/bitset.h b/include/zix/bitset.h
index 68dd344..68dd344 100644
--- a/zix/bitset.h
+++ b/include/zix/bitset.h
diff --git a/zix/btree.h b/include/zix/btree.h
index dde659f..dde659f 100644
--- a/zix/btree.h
+++ b/include/zix/btree.h
diff --git a/zix/chunk.h b/include/zix/chunk.h
index 3646718..3646718 100644
--- a/zix/chunk.h
+++ b/include/zix/chunk.h
diff --git a/zix/common.h b/include/zix/common.h
index 865d232..865d232 100644
--- a/zix/common.h
+++ b/include/zix/common.h
diff --git a/zix/digest.h b/include/zix/digest.h
index 7d44c3d..7d44c3d 100644
--- a/zix/digest.h
+++ b/include/zix/digest.h
diff --git a/zix/hash.h b/include/zix/hash.h
index bef1568..bef1568 100644
--- a/zix/hash.h
+++ b/include/zix/hash.h
diff --git a/zix/ring.h b/include/zix/ring.h
index a64d227..a64d227 100644
--- a/zix/ring.h
+++ b/include/zix/ring.h
diff --git a/zix/sem.h b/include/zix/sem.h
index ae59f10..ae59f10 100644
--- a/zix/sem.h
+++ b/include/zix/sem.h
diff --git a/zix/sorted_array.h b/include/zix/sorted_array.h
index 92f13e6..92f13e6 100644
--- a/zix/sorted_array.h
+++ b/include/zix/sorted_array.h
diff --git a/zix/strindex.h b/include/zix/strindex.h
index beb4646..beb4646 100644
--- a/zix/strindex.h
+++ b/include/zix/strindex.h
diff --git a/zix/thread.h b/include/zix/thread.h
index 8fa562d..8fa562d 100644
--- a/zix/thread.h
+++ b/include/zix/thread.h
diff --git a/zix/tree.h b/include/zix/tree.h
index c340fc0..c340fc0 100644
--- a/zix/tree.h
+++ b/include/zix/tree.h
diff --git a/zix/zix.h b/include/zix/zix.h
index 96d9e10..96d9e10 100644
--- a/zix/zix.h
+++ b/include/zix/zix.h
diff --git a/zix/bitset.c b/src/bitset.c
index cf82ad0..cf82ad0 100644
--- a/zix/bitset.c
+++ b/src/bitset.c
diff --git a/zix/btree.c b/src/btree.c
index 7435445..7435445 100644
--- a/zix/btree.c
+++ b/src/btree.c
diff --git a/zix/chunk.c b/src/chunk.c
index bf80f88..bf80f88 100644
--- a/zix/chunk.c
+++ b/src/chunk.c
diff --git a/zix/digest.c b/src/digest.c
index 941b05c..941b05c 100644
--- a/zix/digest.c
+++ b/src/digest.c
diff --git a/zix/hash.c b/src/hash.c
index 34464d4..34464d4 100644
--- a/zix/hash.c
+++ b/src/hash.c
diff --git a/zix/ring.c b/src/ring.c
index 0607a18..0607a18 100644
--- a/zix/ring.c
+++ b/src/ring.c
diff --git a/zix/sorted_array.c b/src/sorted_array.c
index 0f84227..0f84227 100644
--- a/zix/sorted_array.c
+++ b/src/sorted_array.c
diff --git a/zix/strindex.c b/src/strindex.c
index 8cb05c9..8cb05c9 100644
--- a/zix/strindex.c
+++ b/src/strindex.c
diff --git a/zix/tree.c b/src/tree.c
index a204baf..a204baf 100644
--- a/zix/tree.c
+++ b/src/tree.c
diff --git a/zix/tree_debug.h b/src/tree_debug.h
index 68e37b6..68e37b6 100644
--- a/zix/tree_debug.h
+++ b/src/tree_debug.h
diff --git a/test/inline_test.c b/test/inline_test.c
deleted file mode 100644
index b07f28a..0000000
--- a/test/inline_test.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Copyright 2012 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#define ZIX_INLINE
-
-#include "zix/common.h"
-#include "zix/hash.c"
-#include "zix/tree.c"
-
-#include <stddef.h>
-
-ZIX_CONST_FUNC int
-main(void)
-{
-  zix_hash_free(NULL);
-  zix_tree_free(NULL);
-  return 0;
-}
diff --git a/wscript b/wscript
index 3e3faf1..c67e844 100644
--- a/wscript
+++ b/wscript
@@ -119,21 +119,20 @@ def configure(conf):
 
 
 sources = [
-    'zix/chunk.c',
-    'zix/digest.c',
-    'zix/hash.c',
-    'zix/ring.c',
-    'zix/sorted_array.c',
-    'zix/strindex.c',
-    'zix/tree.c',
-    'zix/btree.c',
-    'zix/bitset.c',
+    'src/chunk.c',
+    'src/digest.c',
+    'src/hash.c',
+    'src/ring.c',
+    'src/sorted_array.c',
+    'src/strindex.c',
+    'src/tree.c',
+    'src/btree.c',
+    'src/bitset.c',
 ]
 
 tests = [
     'digest_test',
     'hash_test',
-    'inline_test',
     'ring_test',
     'sem_test',
     'sorted_array_test',
@@ -146,7 +145,8 @@ tests = [
 
 def build(bld):
     # C Headers
-    bld.install_files('${INCLUDEDIR}/zix', bld.path.ant_glob('zix/*.h'))
+    includedir = '${INCLUDEDIR}/zix-%s/zix' % ZIX_MAJOR_VERSION
+    bld.install_files(includedir, bld.path.ant_glob('include/zix/*.h'))
 
     # Pkgconfig file
     autowaf.build_pc(bld, 'ZIX', ZIX_VERSION, ZIX_MAJOR_VERSION, [],
@@ -162,9 +162,9 @@ def build(bld):
 
     # Library
     bld(features        = 'c cshlib',
-        export_includes = ['.'],
+        export_includes = ['.', 'include'],
         source          = sources,
-        includes        = ['.'],
+        includes        = ['.', 'include'],
         name            = 'libzix',
         target          = 'zix',
         vnum            = ZIX_VERSION,
@@ -174,9 +174,9 @@ def build(bld):
 
     if bld.env.BUILD_STATIC or bld.env.BUILD_BENCH:
         bld(features        = 'c cstlib',
-            export_includes = ['.'],
+            export_includes = ['.', 'include'],
             source          = sources,
-            includes        = ['.'],
+            includes        = ['.', 'include'],
             name            = 'libzix_static',
             target          = 'zix',
             vnum            = ZIX_VERSION,
@@ -199,7 +199,7 @@ def build(bld):
         # Profiled static library (for unit test code coverage)
         bld(features     = 'c cstlib',
             source       = sources,
-            includes     = ['.'],
+            includes     = ['.', 'include'],
             lib          = test_libs,
             name         = 'libzix_profiled',
             target       = 'zix_profiled',
@@ -218,7 +218,7 @@ def build(bld):
         for i in tests:
             bld(features     = 'c cprogram',
                 source       = ['test/%s.c' % i] + test_malloc,
-                includes     = ['.'],
+                includes     = ['.', 'include'],
                 use          = 'libzix_profiled',
                 lib          = test_libs,
                 target       = 'test/%s' % i,
@@ -232,7 +232,7 @@ def build(bld):
         for i in ['tree_bench', 'dict_bench']:
             bld(features     = 'c cprogram',
                 source       = 'benchmark/%s.c' % i,
-                includes     = ['.'],
+                includes     = ['.', 'include'],
                 use          = 'libzix_static',
                 uselib       = 'GLIB',
                 lib          = ['rt'],