Move all header files into src/loc and install them
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Dec 2017 11:20:30 +0000 (11:20 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Dec 2017 11:20:30 +0000 (11:20 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
16 files changed:
Makefile.am
src/as.c
src/database.c
src/libloc.c
src/loc/as.h [moved from src/as.h with 98% similarity]
src/loc/database.h [moved from src/database.h with 98% similarity]
src/loc/private.h [moved from src/libloc-private.h with 100% similarity]
src/loc/stringpool.h [moved from src/stringpool.h with 100% similarity]
src/loc/writer.h
src/network.c
src/python/database.c
src/stringpool.c
src/test-as.c
src/test-database.c
src/test-stringpool.c
src/writer.c

index 30a7652..eddef93 100644 (file)
@@ -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
index 654ab26..d82e44b 100644 (file)
--- a/src/as.c
+++ b/src/as.c
 #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;
index f2450aa..07cb66c 100644 (file)
 #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;
index 667fd7c..8b8872c 100644 (file)
@@ -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;
similarity index 98%
rename from src/as.h
rename to src/loc/as.h
index 1aefe30..14e9cf3 100644 (file)
--- a/src/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);
similarity index 98%
rename from src/database.h
rename to src/loc/database.h
index 38dc4ef..28c29e9 100644 (file)
@@ -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);
similarity index 100%
rename from src/libloc-private.h
rename to src/loc/private.h
similarity index 100%
rename from src/stringpool.h
rename to src/loc/stringpool.h
index 82923d0..9b05ec7 100644 (file)
 #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);
index bc359f6..8617fd5 100644 (file)
 #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;
index 154debc..0e3ddea 100644 (file)
@@ -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) {
index cbb1fb7..119740c 100644 (file)
@@ -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,
index 0c4d391..08c8730 100644 (file)
@@ -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
 
index 600a983..b8890cb 100644 (file)
@@ -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 =
index 1b219f3..11653fe 100644 (file)
@@ -25,7 +25,7 @@
 #include <time.h>
 
 #include <loc/libloc.h>
-#include "stringpool.h"
+#include <loc/stringpool.h>
 
 static const char* characters = "012345789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
index 4c9bcf6..8c6ed88 100644 (file)
 #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;