make all include paths relative to /src

src/Makefile.am

@@ -6,9 +6,9 @@ bin_PROGRAMS = kdig khost knsupdate knsec3hash
 noinst_LTLIBRARIES = libknot.la libknotd.la libknots.la
 
 # $(YACC) will generate header file
-AM_CPPFLAGS = -I$(top_srcdir)/src/libknot -DSYSCONFDIR='"$(sysconfdir)"' \
-	-DSBINDIR='"$(sbindir)"' -DCONFIG_DIR='"${config_dir}"' \
-	-DSTORAGE_DIR='"${storage_dir}"' -DRUN_DIR='"${run_dir}"'
+AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"' \
+	      -DCONFIG_DIR='"${config_dir}"' -DSTORAGE_DIR='"${storage_dir}"' \
+	      -DRUN_DIR='"${run_dir}"'
 AM_YFLAGS = -d
 libknotd_la_YFLAGS = -pcf_ -d
 libknotd_la_LFLAGS = # TODO: reentrant parser, prefix

src/common/base32hex.c

@@ -15,8 +15,8 @@
  */
 
 #include <config.h>
-#include "base32hex.h"
-#include "errcode.h"
+#include "common/base32hex.h"
+#include "common/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t

src/common/base64.c

@@ -15,8 +15,8 @@
  */
 
 #include <config.h>
-#include "base64.h"
-#include "errcode.h"
+#include "common/base64.h"
+#include "common/errcode.h"
 
 #include <stdlib.h>			// malloc
 #include <stdint.h>			// uint8_t

src/common/dSFMT-params.h

 #ifndef DSFMT_PARAMS_H
 #define DSFMT_PARAMS_H
 
-#include "dSFMT.h"
+#include "common/dSFMT.h"
 
 /*----------------------
   the parameters of DSFMT
@@ -55,7 +55,7 @@
 #endif
 
 #if DSFMT_MEXP == 521
-  #include "dSFMT-params521.h"
+  #include "common/dSFMT-params521.h"
 #elif DSFMT_MEXP == 1279
   #include "dSFMT-params1279.h"
 #elif DSFMT_MEXP == 2203

src/common/dSFMT.c

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "dSFMT-params.h"
+#include "common/dSFMT-params.h"
 
 /** dsfmt internal state vector */
 dsfmt_t dsfmt_global_data;

src/common/fdset.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include <time.h>
 #include "common/fdset.h"
-#include "common.h"
+#include "libknot/common.h"
 
 /* Workarounds for clock_gettime() not available on some platforms. */
 #ifdef HAVE_CLOCK_GETTIME

src/common/hattrie/ahtable.c

@@ -8,8 +8,8 @@
 #include <config.h>
 #include <assert.h>
 #include <string.h>
-#include "ahtable.h"
-#include "murmurhash3.h"
+#include "common/hattrie/ahtable.h"
+#include "common/hattrie/murmurhash3.h"
 
 enum {
     AH_SORTED  = 0x01,/* sorted iteration */

src/common/hattrie/ahtable.h

@@ -26,8 +26,8 @@ extern "C" {
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "common.h"
-#include "hat-trie.h"
+#include "libknot/common.h"
+#include "common/hattrie/hat-trie.h"
 
 typedef unsigned char* slot_t;
 

src/common/hattrie/hat-trie.c

@@ -9,8 +9,8 @@
 #include <stdint.h>
 #include <assert.h>
 #include <string.h>
-#include "hat-trie.h"
-#include "ahtable.h"
+#include "common/hattrie/hat-trie.h"
+#include "common/hattrie/ahtable.h"
 
 /* number of child nodes for used alphabet */
 #define NODE_CHILDS (TRIE_MAXCHAR+1)

src/common/hattrie/hat-trie.h

@@ -24,7 +24,7 @@ extern "C" {
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include "common.h"
+#include "libknot/common.h"
 #include "common/mempattern.h"
 
 /* Hat-trie defines. */

src/common/hattrie/murmurhash3.c

@@ -2,7 +2,7 @@
  * by its author, Austin Appleby. */
 
 #include <config.h>
-#include "murmurhash3.h"
+#include "common/hattrie/murmurhash3.h"
 
 static inline uint32_t fmix(uint32_t h)
 {

src/common/heap.c

@@ -38,7 +38,7 @@
  ***/
 
 #include <config.h>
-#include "heap.h"
+#include "common/heap.h"
 #include <string.h>
 #include <stdlib.h>
 

src/common/libtap/tap.c

@@ -9,8 +9,8 @@ This file is licensed under the GPL v3
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include "common.h"
-#include "tap.h"
+#include "libknot/common.h"
+#include "common/libtap/tap.h"
 
 static int expected_tests = NO_PLAN;
 static int failed_tests;

src/common/mempattern.c

@@ -21,7 +21,7 @@
 #include <sys/resource.h>
 #include <stdarg.h>
 
-#include "mempattern.h"
+#include "common/mempattern.h"
 #include "common/log.h"
 #include "common/slab/alloc-common.h"
 

src/common/mempool.c

@@ -12,7 +12,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "mempool.h"
+#include "common/mempool.h"
 #include "common/mempattern.h"
 
 #include <string.h>

src/common/print.c

@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "print.h"
+#include "common/print.h"
 
 void array_printf(const uint8_t *data, const unsigned length,
                   printf_t print_handler, const char type)

src/common/prng.c

@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #endif
 
-#include "common.h"
-#include "prng.h"
-#include "dSFMT.h"
+#include "libknot/common.h"
+#include "common/prng.h"
+#include "common/dSFMT.h"
 
 /*! \brief TLS unique key for each thread seed. */
 static pthread_key_t tls_prng_key;

src/common/ref.c

@@ -17,7 +17,7 @@
 #include <config.h>
 #include <stdio.h>
 
-#include "ref.h"
+#include "common/ref.h"
 
 void ref_init(ref_t *p, ref_destructor_t dtor)
 {

src/knot/conf/cf-parse.y

@@ -33,7 +33,7 @@
 #include "libknot/binary.h"
 #include "libknot/edns.h"
 #include "knot/conf/conf.h"
-#include "libknotd_la-cf-parse.h" /* Automake generated header. */
+#include "knot/conf/libknotd_la-cf-parse.h" /* Automake generated header. */
 
 extern int cf_lex (YYSTYPE *lvalp, void *scanner);
 extern void cf_error(void *scanner, const char *format, ...);

src/knot/ctl/remote.c

@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <sys/stat.h>
-#include "remote.h"
+#include "knot/ctl/remote.h"
 #include "common/log.h"
 #include "common/fdset.h"
 #include "common/prng.h"