Move all header files into src/loc and install them

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 30a7652095693f78e3f8ab41aef666423fa6710f..eddef93bc4f8bca952fad0f5e67cb0dae9610339 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,23 +36,24 @@ pkgconfigdir = $(libdir)/pkgconfig
        $(SED_PROCESS)
 
 pkginclude_HEADERS = \
-       src/loc/format.h \
        src/loc/libloc.h \
+       src/loc/as.h \
+       src/loc/database.h \
+       src/loc/format.h \
+       src/loc/network.h \
+       src/loc/private.h \
+       src/loc/stringpool.h \
        src/loc/writer.h
 
 lib_LTLIBRARIES = \
        src/libloc.la
 
-src_libloc_la_SOURCES =\
-       src/libloc-private.h \
+src_libloc_la_SOURCES = \
        src/libloc.c \
        src/as.c \
-       src/as.h \
        src/database.c \
-       src/database.h \
        src/network.c \
        src/stringpool.c \
-       src/stringpool.h \
        src/writer.c
 
 EXTRA_DIST += src/libloc.sym

diff --git a/src/as.c b/src/as.c
index 654ab262f5a658787371afd6115e9bdd0746615f..d82e44bcc1023734fb6d861b5e76fd752bad1bf6 100644 (file)
--- a/src/as.c
+++ b/src/as.c
@@ -20,11 +20,10 @@
 #include <stdlib.h>
 
 #include <loc/libloc.h>
+#include <loc/as.h>
 #include <loc/format.h>
-
-#include "libloc-private.h"
-#include "as.h"
-#include "stringpool.h"
+#include <loc/private.h>
+#include <loc/stringpool.h>
 
 struct loc_as {
        struct loc_ctx* ctx;

diff --git a/src/database.c b/src/database.c
index f2450aab1b294a706b2f2ea3954ca69382ed41dc..07cb66c5f68a937b63a976bdc1fb9bf274024dca 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -27,12 +27,11 @@
 #include <unistd.h>
 
 #include <loc/libloc.h>
+#include <loc/as.h>
+#include <loc/database.h>
 #include <loc/format.h>
-
-#include "libloc-private.h"
-#include "as.h"
-#include "database.h"
-#include "stringpool.h"
+#include <loc/private.h>
+#include <loc/stringpool.h>
 
 struct loc_database {
        struct loc_ctx* ctx;

diff --git a/src/libloc.c b/src/libloc.c
index 667fd7cf2f35466a4b333d4a55608711ce7678e9..8b8872c404da93571bab75ea25e95b5428a65dd0 100644 (file)
--- a/src/libloc.c
+++ b/src/libloc.c
@@ -24,8 +24,8 @@
 #include <ctype.h>
 
 #include <loc/libloc.h>
-#include "libloc-private.h"
-#include "database.h"
+#include <loc/database.h>
+#include <loc/private.h>
 
 struct loc_ctx {
        int refcount;

diff --git a/src/as.h b/src/loc/as.h
similarity index 98%
rename from src/as.h
rename to src/loc/as.h
index 1aefe3058b87491d58973e8e2af90d53fc77bcd0..14e9cf3b1f7651a4537ff6b2c88fa2b068f66903 100644 (file)
--- a/src/as.h
+++ b/src/loc/as.h
@@ -21,8 +21,7 @@
 
 #include <loc/libloc.h>
 #include <loc/format.h>
-
-#include "stringpool.h"
+#include <loc/stringpool.h>
 
 struct loc_as;
 int loc_as_new(struct loc_ctx* ctx, struct loc_stringpool* pool, struct loc_as** as, uint32_t number);

diff --git a/src/database.h b/src/loc/database.h
similarity index 98%
rename from src/database.h
rename to src/loc/database.h
index 38dc4efd5eb9c58ee5a0d16394019d9f3eb936c7..28c29e9912aef47578568212bfb6e54aa3f2312c 100644 (file)
--- a/src/database.h
+++ b/src/loc/database.h
@@ -21,8 +21,7 @@
 #include <stdint.h>
 
 #include <loc/libloc.h>
-
-#include "as.h"
+#include <loc/as.h>
 
 struct loc_database;
 int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f);

diff --git a/src/libloc-private.h b/src/loc/private.h
similarity index 100%
rename from src/libloc-private.h
rename to src/loc/private.h

diff --git a/src/stringpool.h b/src/loc/stringpool.h
similarity index 100%
rename from src/stringpool.h
rename to src/loc/stringpool.h

diff --git a/src/loc/writer.h b/src/loc/writer.h
index 82923d012152af9413d5f2c4af0614a8424a40c3..9b05ec7034e03870f44cae1c96cf7d879d9d729a 100644 (file)
--- a/src/loc/writer.h
+++ b/src/loc/writer.h
@@ -20,10 +20,9 @@
 #include <stdio.h>
 
 #include <loc/libloc.h>
+#include <loc/as.h>
 #include <loc/network.h>
 
-#include "as.h"
-
 struct loc_writer;
 
 int loc_writer_new(struct loc_ctx* ctx, struct loc_writer** writer);

diff --git a/src/network.c b/src/network.c
index bc359f6c408163464e6678e6c5816beab7d3ed5a..8617fd5e233ed1ec3ad091ef7161853f09b3cbb7 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -22,10 +22,9 @@
 #include <string.h>
 
 #include <loc/libloc.h>
+#include <loc/as.h>
 #include <loc/network.h>
-
-#include "libloc-private.h"
-#include "as.h"
+#include <loc/private.h>
 
 struct loc_network {
        struct loc_ctx* ctx;

diff --git a/src/python/database.c b/src/python/database.c
index 154debc053c8cd857b1c5704f5a2e8ea53e587fa..0e3ddea8c22b5059e4de74ec9bd6c28566e2448f 100644 (file)
--- a/src/python/database.c
+++ b/src/python/database.c
@@ -16,7 +16,9 @@
 
 #include <Python.h>
 
-#include "../database.h"
+#include <loc/libloc.h>
+#include <loc/database.h>
+
 #include "database.h"
 
 static PyObject* Database_new(PyTypeObject* type, PyObject* args, PyObject* kwds) {

diff --git a/src/stringpool.c b/src/stringpool.c
index cbb1fb7af5117f9c22cde038eb6fa14902fee8dd..119740c5064577916154ba8ef817c7ee016dfdf9 100644 (file)
--- a/src/stringpool.c
+++ b/src/stringpool.c
@@ -24,8 +24,8 @@
 
 #include <loc/libloc.h>
 #include <loc/format.h>
-#include "libloc-private.h"
-#include "stringpool.h"
+#include <loc/private.h>
+#include <loc/stringpool.h>
 
 enum loc_stringpool_mode {
        STRINGPOOL_DEFAULT,

diff --git a/src/test-as.c b/src/test-as.c
index 0c4d391e78e56fb7745e785a89e57bdaf3e61b74..08c8730f419ca872e7b8cda4b454dd0dfd4e6219 100644 (file)
--- a/src/test-as.c
+++ b/src/test-as.c
@@ -19,8 +19,8 @@
 #include <string.h>
 
 #include <loc/libloc.h>
+#include <loc/database.h>
 #include <loc/writer.h>
-#include "database.h"
 
 #define TEST_AS_COUNT 5000
 

diff --git a/src/test-database.c b/src/test-database.c
index 600a983235207fb6ac1d05c0671e70ce1193b0f2..b8890cba154f942f44f7f022e2da95014a76ac0a 100644 (file)
--- a/src/test-database.c
+++ b/src/test-database.c
@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include <loc/libloc.h>
+#include <loc/database.h>
 #include <loc/writer.h>
-#include "database.h"
 
 const char* VENDOR = "Test Vendor";
 const char* DESCRIPTION =

diff --git a/src/test-stringpool.c b/src/test-stringpool.c
index 1b219f38a99a002aa176a5cdfaa84dfe574b2d44..11653fea6232b31b0fa9c2a9398a854d6778a546 100644 (file)
--- a/src/test-stringpool.c
+++ b/src/test-stringpool.c
@@ -25,7 +25,7 @@
 #include <time.h>
 
 #include <loc/libloc.h>
-#include "stringpool.h"
+#include <loc/stringpool.h>
 
 static const char* characters = "012345789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 

diff --git a/src/writer.c b/src/writer.c
index 4c9bcf654fdc7977c281d606b3a222de5e1671b0..8c6ed8876d17e63f5520cd406bdf0207224c6ce7 100644 (file)
--- a/src/writer.c
+++ b/src/writer.c
@@ -21,13 +21,13 @@
 #include <string.h>
 #include <time.h>
 
+#include <loc/libloc.h>
+#include <loc/as.h>
 #include <loc/format.h>
 #include <loc/network.h>
+#include <loc/private.h>
 #include <loc/writer.h>
 
-#include "libloc-private.h"
-#include "as.h"
-
 struct loc_writer {
        struct loc_ctx* ctx;
        int refcount;