move files to src, include and doc dirs

doc/Doxyfile

@@ -919,7 +919,8 @@ WARN_LOGFILE           =
 
 INPUT                  = \
 	doc/mainpage.dox \
-	.
+	include/ \
+	src/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

src/assert.h

@@ -27,7 +27,7 @@
 #ifndef CDBUS_ASSERT_H__F236CB4F_D812_4636_958C_C82FD3781EC8__INCLUDED
 #define CDBUS_ASSERT_H__F236CB4F_D812_4636_958C_C82FD3781EC8__INCLUDED
 
-#include "log.h"
+#include <cdbus/log.h>
 
 #include <assert.h>
 

src/helpers.c

@@ -27,12 +27,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cdbus.h"
+#include <cdbus/cdbus.h>
 
 #include <string.h>
 #include <stdlib.h>
 
-#include "method.h"
+#include <cdbus/method.h>
 #include "klist.h"
 #include "assert.h"
 

src/interface.c

@@ -27,10 +27,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cdbus.h"
+#include <cdbus/cdbus.h>
 
 #include <string.h>
-#include "log.h"
+#include <cdbus/log.h>
 
 /*
  * Execute a method's function if the method specified in the method call

src/log.c

@@ -26,7 +26,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "log.h"
+#include <cdbus/log.h>
 
 cdbus_log_function cdbus_log;
 

src/method.c

@@ -27,10 +27,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cdbus.h"
+#include <cdbus/cdbus.h>
 
 #include <stdio.h>
-#include "log.h"
+#include <cdbus/log.h>
 
 __attribute__((visibility("default")))
 void cdbus_error(struct cdbus_method_call * call_ptr, const char * err_name, const char * format, ...)

src/object_path.c

@@ -27,11 +27,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cdbus.h"
+#include <cdbus/cdbus.h>
 
 #include <stdlib.h>             /* malloc() and others */
 #include <string.h>             /* strcmp() */
-#include "log.h"
+#include <cdbus/log.h>
 #include "assert.h"
 
 /* TODO: move to dedicated header */

src/signal.c

@@ -27,10 +27,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cdbus.h"
+#include <cdbus/cdbus.h>
 
 #include <stdarg.h>
-#include "log.h"
+#include <cdbus/log.h>
 #include "assert.h"
 
 __attribute__((visibility("default")))

wscript

@@ -179,29 +179,29 @@ def build(bld):
 
     bld(rule=git_ver, target='version.h', update_outputs=True, always=True, ext_out=['.h'])
 
-    libcdbus = bld.shlib(source = [], features = 'c cshlib', includes = [bld.path.get_bld()])
+    libcdbus = bld.shlib(source = [], features = 'c cshlib', includes = [bld.path.get_bld(), "./include/cdbus-1"])
     libcdbus.uselib = 'DBUS-1'
     libcdbus.target = 'cdbus'
     libcdbus.vnum = "1.0.0"
     libcdbus.defines = ['LOG_OUTPUT_STDOUT']
 
     libcdbus.source = [
-        'signal.c',
-        'method.c',
-        'object_path.c',
-        'interface.c',
-        'helpers.c',
-        'log.c',
+        'src/signal.c',
+        'src/method.c',
+        'src/object_path.c',
+        'src/interface.c',
+        'src/helpers.c',
+        'src/log.c',
     ]
 
     bld.install_files('${PREFIX}/include/cdbus-1/cdbus', [
         'version.h',
-        'signal.h',
-        'method.h',
-        'object_path.h',
-        'interface.h',
-        'cdbus.h',
-        'log.h',
+        'include/cdbus-1/cdbus/signal.h',
+        'include/cdbus-1/cdbus/method.h',
+        'include/cdbus-1/cdbus/object_path.h',
+        'include/cdbus-1/cdbus/interface.h',
+        'include/cdbus-1/cdbus/cdbus.h',
+        'include/cdbus-1/cdbus/log.h',
     ])
 
     # process cdbus-1.pc.in -> cdbus-1.pc
@@ -218,7 +218,7 @@ def build(bld):
     bld.install_files('${DOCDIR}', [
         "NEWS.adoc",
         "README.adoc",
-        "gpl2.txt",
+        "doc/gpl2.txt",
         "AUTHORS",
     ])