Move include files to /usr/include/libloc

There was a discrepancy between the paths in the build environment and
the installed headers which could not be included in any third-party
software.

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

diff --git a/Makefile.am b/Makefile.am
index dbdfd8efcb803395fae2514a80d04968e60db346..2c55f0a1d02d84f46ee19acd90ce8cb5a9d128fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,20 +90,20 @@ EXTRA_DIST += \
        examples/python/read-database.py
 
 pkginclude_HEADERS = \
-       src/loc/libloc.h \
-       src/loc/as.h \
-       src/loc/as-list.h \
-       src/loc/compat.h \
-       src/loc/country.h \
-       src/loc/country-list.h \
-       src/loc/database.h \
-       src/loc/format.h \
-       src/loc/network.h \
-       src/loc/network-list.h \
-       src/loc/private.h \
-       src/loc/stringpool.h \
-       src/loc/resolv.h \
-       src/loc/writer.h
+       src/libloc/libloc.h \
+       src/libloc/as.h \
+       src/libloc/as-list.h \
+       src/libloc/compat.h \
+       src/libloc/country.h \
+       src/libloc/country-list.h \
+       src/libloc/database.h \
+       src/libloc/format.h \
+       src/libloc/network.h \
+       src/libloc/network-list.h \
+       src/libloc/private.h \
+       src/libloc/stringpool.h \
+       src/libloc/resolv.h \
+       src/libloc/writer.h
 
 lib_LTLIBRARIES = \
        src/libloc.la

diff --git a/src/as-list.c b/src/as-list.c
index 5acbb8a9d8e056a130b0db1944d118783401de05..820357c4ef2fd9ecc42144238ab52421e950828b 100644 (file)
--- a/src/as-list.c
+++ b/src/as-list.c
@@ -17,9 +17,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/private.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/private.h>
 
 struct loc_as_list {
        struct loc_ctx* ctx;

diff --git a/src/as.c b/src/as.c
index 757bf3d3b742b19b29d426974beaf4813b953384..2cbd5c8c4fe06ff1c54878aa80512901384c7804 100644 (file)
--- a/src/as.c
+++ b/src/as.c
@@ -24,12 +24,12 @@
 #  include <endian.h>
 #endif
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/compat.h>
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/compat.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 struct loc_as {
        struct loc_ctx* ctx;

diff --git a/src/country-list.c b/src/country-list.c
index 103536cdc52f2d7599734c1310622c867dc54258..6c4953395c121eab65a5eb4fe45d816b8db0bb57 100644 (file)
--- a/src/country-list.c
+++ b/src/country-list.c
@@ -17,9 +17,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <loc/country.h>
-#include <loc/country-list.h>
-#include <loc/private.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
+#include <libloc/private.h>
 
 struct loc_country_list {
        struct loc_ctx* ctx;

diff --git a/src/country.c b/src/country.c
index 3ad3aacdaee8fb642442473ff22896004a7aa68c..957ce2e3f5643acaccfb34e96074f763c6b0e044 100644 (file)
--- a/src/country.c
+++ b/src/country.c
@@ -18,10 +18,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/private.h>
 
 struct loc_country {
        struct loc_ctx* ctx;

diff --git a/src/database.c b/src/database.c
index 6cfefee6ec7eea26cc96f527ac4d7248b915e321..61b607823ecc9a04902aed28ead000a89fad3373 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -36,18 +36,18 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/country-list.h>
-#include <loc/database.h>
-#include <loc/format.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
+#include <libloc/database.h>
+#include <libloc/format.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 struct loc_database {
        struct loc_ctx* ctx;

diff --git a/src/libloc.c b/src/libloc.c
index 0f2227994284e9a3ce2b2a24d8559cdd905df8ff..1fee08eaf7993600b9b2e6fa8fed71d24887ee93 100644 (file)
--- a/src/libloc.c
+++ b/src/libloc.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/private.h>
 
 struct loc_ctx {
        int refcount;

diff --git a/src/loc/as-list.h b/src/libloc/as-list.h
similarity index 96%
rename from src/loc/as-list.h
rename to src/libloc/as-list.h
index 7b5c4e859d915621e73ee6fa1d7f92036fb39f22..77ac872d3a23ba3273b8cd3ed260ab5eec035d1b 100644 (file)
--- a/src/loc/as-list.h
+++ b/src/libloc/as-list.h
@@ -17,8 +17,8 @@
 #ifndef LIBLOC_AS_LIST_H
 #define LIBLOC_AS_LIST_H
 
-#include <loc/as.h>
-#include <loc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/libloc.h>
 
 struct loc_as_list;
 

diff --git a/src/loc/as.h b/src/libloc/as.h
similarity index 94%
rename from src/loc/as.h
rename to src/libloc/as.h
index b4c8e1d66fc509051b4541bb2d10a8c642c70b97..05e0188803267ba4bc342df3cfc907f2dd0754dd 100644 (file)
--- a/src/loc/as.h
+++ b/src/libloc/as.h
@@ -19,9 +19,9 @@
 
 #include <stdint.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/stringpool.h>
 
 struct loc_as;
 int loc_as_new(struct loc_ctx* ctx, struct loc_as** as, uint32_t number);

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

diff --git a/src/loc/country-list.h b/src/libloc/country-list.h
similarity index 96%
rename from src/loc/country-list.h
rename to src/libloc/country-list.h
index a7f818a52f29597bd1f36044e11608aaa4a9757c..c42b66fdf7cbe1dd797094765d44c3f0f4bbcf78 100644 (file)
--- a/src/loc/country-list.h
+++ b/src/libloc/country-list.h
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
 
 struct loc_country_list;
 

diff --git a/src/loc/country.h b/src/libloc/country.h
similarity index 95%
rename from src/loc/country.h
rename to src/libloc/country.h
index d09daee9381cdac6d12f7e93f86a97297fcea95f..4cc3a059e1bfcf6754ef819df7794e96a41e1fb6 100644 (file)
--- a/src/loc/country.h
+++ b/src/libloc/country.h
@@ -17,9 +17,9 @@
 #ifndef LIBLOC_COUNTRY_H
 #define LIBLOC_COUNTRY_H
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/stringpool.h>
 
 struct loc_country;
 int loc_country_new(struct loc_ctx* ctx, struct loc_country** country, const char* country_code);

diff --git a/src/loc/database.h b/src/libloc/database.h
similarity index 96%
rename from src/loc/database.h
rename to src/libloc/database.h
index 9d1f71a2ae456df98e2806b6f0a7a1610b03d7c5..8eab24d65b02677940671b6e1bf44241e26a59a9 100644 (file)
--- a/src/loc/database.h
+++ b/src/libloc/database.h
@@ -21,11 +21,11 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/as.h>
-#include <loc/country.h>
-#include <loc/country-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/as.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
 
 struct loc_database;
 int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f);

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

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

diff --git a/src/loc/network-list.h b/src/libloc/network-list.h
similarity index 98%
rename from src/loc/network-list.h
rename to src/libloc/network-list.h
index 308b262f883ff8ebcf8e0078fed21bbc5b4bb89a..988a8a0d692638b1705fe96bdbc9f6b6876e775a 100644 (file)
--- a/src/loc/network-list.h
+++ b/src/libloc/network-list.h
@@ -17,7 +17,7 @@
 #ifndef LIBLOC_NETWORK_LIST_H
 #define LIBLOC_NETWORK_LIST_H
 
-#include <loc/network.h>
+#include <libloc/network.h>
 
 struct loc_network_list;
 int loc_network_list_new(struct loc_ctx* ctx, struct loc_network_list** list);

diff --git a/src/loc/network.h b/src/libloc/network.h
similarity index 98%
rename from src/loc/network.h
rename to src/libloc/network.h
index 9e452bf013374256eb27fd2a25d64fe274e24eff..030d0369f2542ac6801ec3443cb9ee7f0a421ed7 100644 (file)
--- a/src/loc/network.h
+++ b/src/libloc/network.h
@@ -19,9 +19,9 @@
 
 #include <netinet/in.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/network-list.h>
 
 enum loc_network_flags {
        LOC_NETWORK_FLAG_ANONYMOUS_PROXY    = (1 << 0), // A1

diff --git a/src/loc/private.h b/src/libloc/private.h
similarity index 99%
rename from src/loc/private.h
rename to src/libloc/private.h
index 6b98d1c4d2f53c39868ecfcdcca89849dc863277..de4b9aec64015e4a5dd1c329b3b034f8342ed8d1 100644 (file)
--- a/src/loc/private.h
+++ b/src/libloc/private.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 static inline void __attribute__((always_inline, format(printf, 2, 3)))
 loc_log_null(struct loc_ctx *ctx, const char *format, ...) {}

diff --git a/src/loc/resolv.h b/src/libloc/resolv.h
similarity index 96%
rename from src/loc/resolv.h
rename to src/libloc/resolv.h
index 3b70c606f217b26ded7a0c03e3995a79fee7bd9d..dd13d60d8674ab04e9aa21b5321443d1eda5707f 100644 (file)
--- a/src/loc/resolv.h
+++ b/src/libloc/resolv.h
@@ -19,7 +19,7 @@
 
 #include <time.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 int loc_discover_latest_version(struct loc_ctx* ctx, unsigned int version, time_t* t);
 

diff --git a/src/loc/stringpool.h b/src/libloc/stringpool.h
similarity index 98%
rename from src/loc/stringpool.h
rename to src/libloc/stringpool.h
index 8068242c24b5bb78fe37f97307e53a7ed4023ad8..932aad7eddbb294a2d3b09785697751741ac76d3 100644 (file)
--- a/src/loc/stringpool.h
+++ b/src/libloc/stringpool.h
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 struct loc_stringpool;
 int loc_stringpool_new(struct loc_ctx* ctx, struct loc_stringpool** pool);

diff --git a/src/loc/writer.h b/src/libloc/writer.h
similarity index 92%
rename from src/loc/writer.h
rename to src/libloc/writer.h
index f106a948b0c0a16c13464d14f79e8dd47853244a..eae9548ab74cd1186f2f93d26f71d03a50e7480b 100644 (file)
--- a/src/loc/writer.h
+++ b/src/libloc/writer.h
@@ -19,11 +19,11 @@
 
 #include <stdio.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/network.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
 
 struct loc_writer;
 

diff --git a/src/network-list.c b/src/network-list.c
index 224b34508e3bcd865fb6acae9fad7fd9873d7bdb..58aa11e100a0b78b654b30df0b858511448228bf 100644 (file)
--- a/src/network-list.c
+++ b/src/network-list.c
@@ -18,9 +18,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/private.h>
 
 struct loc_network_list {
        struct loc_ctx* ctx;

diff --git a/src/network.c b/src/network.c
index 24c593d1cf57097b20ad1138cc47a62be598c035..7b1bc7cc9ec38e9e1354d8275ac3f6f259ee0ddd 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -25,12 +25,12 @@
 #  include <endian.h>
 #endif
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
 
 struct loc_network {
        struct loc_ctx* ctx;

diff --git a/src/perl/Location.xs b/src/perl/Location.xs
index 73f85b45ce586f5136b0738f33afa61e95cd5f67..6f21f2b088f84c3e38de52006a342d2b59281ef5 100644 (file)
--- a/src/perl/Location.xs
+++ b/src/perl/Location.xs
@@ -6,10 +6,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/country.h>
 
 MODULE = Location              PACKAGE = Location
 

diff --git a/src/python/as.c b/src/python/as.c
index 2e111b588c1be44692a5ee41337563b1607ee930..4cf99874e4c40a111d5e919dffae622224f797a0 100644 (file)
--- a/src/python/as.c
+++ b/src/python/as.c
@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
 
 #include "locationmodule.h"
 #include "as.h"

diff --git a/src/python/as.h b/src/python/as.h
index 5bc72409b793e0956f70d2522f6f27200b7f68c8..d7fe36a35ca8af23ef83c381b8edf85c5c010121 100644 (file)
--- a/src/python/as.h
+++ b/src/python/as.h
@@ -19,8 +19,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/python/country.c b/src/python/country.c
index 1247a08e1014d254bce243b2b631597020459d8e..4bb6a3105e5eb7e3c4a7451786190c4fe3a10619 100644 (file)
--- a/src/python/country.c
+++ b/src/python/country.c
@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
 
 #include "locationmodule.h"
 #include "country.h"

diff --git a/src/python/country.h b/src/python/country.h
index 3d787d917ebc50dddf6e89b61e62be9bb89ef04b..346163c7c6c356313e1ba6cbf788a2a76e326a90 100644 (file)
--- a/src/python/country.h
+++ b/src/python/country.h
@@ -19,8 +19,7 @@
 
 #include <Python.h>
 
-//#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/country.h>
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/python/database.c b/src/python/database.c
index 8de721fff8f4d47b872a2dd5c772396273dddec8..ca56748c72443aa07e206016f86bec9b387be93d 100644 (file)
--- a/src/python/database.c
+++ b/src/python/database.c
@@ -16,10 +16,10 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/database.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/database.h>
 
 #include "locationmodule.h"
 #include "as.h"

diff --git a/src/python/database.h b/src/python/database.h
index b8c766ec8931ad44303b76e678c95808b4ff0280..88b839b5ed226eeb7f248af0f872dce768bd54ff 100644 (file)
--- a/src/python/database.h
+++ b/src/python/database.h
@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/database.h>
+#include <libloc/database.h>
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/python/locationmodule.c b/src/python/locationmodule.c
index 5dd4ec645ccf3854950906980cd7c46db3f66946..15f661b05e1f633ab18ab28fba52d80650eb6c16 100644 (file)
--- a/src/python/locationmodule.c
+++ b/src/python/locationmodule.c
@@ -17,8 +17,8 @@
 #include <Python.h>
 #include <syslog.h>
 
-#include <loc/format.h>
-#include <loc/resolv.h>
+#include <libloc/format.h>
+#include <libloc/resolv.h>
 
 #include "locationmodule.h"
 #include "as.h"

diff --git a/src/python/locationmodule.h b/src/python/locationmodule.h
index 2f4d652c20c7475b037e934565f3cfe3a7c70cd3..e2679868a88ee92be510834cd2795047b128bffc 100644 (file)
--- a/src/python/locationmodule.h
+++ b/src/python/locationmodule.h
@@ -17,8 +17,7 @@
 #ifndef PYTHON_LOCATION_MODULE_H
 #define PYTHON_LOCATION_MODULE_H
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
 
 extern struct loc_ctx* loc_ctx;
 

diff --git a/src/python/network.c b/src/python/network.c
index 5b1369d6fd91352f680f7ee33fa677816392b19c..9dc6ab6e6ede05657220a32096f7dd6957763204 100644 (file)
--- a/src/python/network.c
+++ b/src/python/network.c
@@ -19,9 +19,9 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
 
 #include "locationmodule.h"
 #include "network.h"

diff --git a/src/python/network.h b/src/python/network.h
index 43665ba0f0be45bf75ad4c109d0768a487ca826c..b137e7208595c3ec6187600cb15bc3dbcb8d13cc 100644 (file)
--- a/src/python/network.h
+++ b/src/python/network.h
@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/network.h>
+#include <libloc/network.h>
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/python/writer.c b/src/python/writer.c
index a3ceae69fb85af0fa265a20b69629965f491ac82..c54596a1aba6af6a83e84a322d6c088705baae54 100644 (file)
--- a/src/python/writer.c
+++ b/src/python/writer.c
@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/writer.h>
 
 #include "locationmodule.h"
 #include "as.h"

diff --git a/src/python/writer.h b/src/python/writer.h
index 6fe4c8d1e7e12f2100fd54b07c90d024531fc1ef..10ca26bf95c928c35aeadc34c8c616646128453b 100644 (file)
--- a/src/python/writer.h
+++ b/src/python/writer.h
@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/writer.h>
+#include <libloc/writer.h>
 
 typedef struct {
        PyObject_HEAD

diff --git a/src/resolv.c b/src/resolv.c
index e42e9de3e7673fb119236eecd4442af90d2d6add..1c4cd75a1cb069cb3e63fe73ac763caaed6cf341 100644 (file)
--- a/src/resolv.c
+++ b/src/resolv.c
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <time.h>
 
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/resolv.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/resolv.h>
 
 static int parse_timestamp(const unsigned char* txt, time_t* t) {
     struct tm ts;

diff --git a/src/stringpool.c b/src/stringpool.c
index 49606de2609f68eeaaf19c8902f3e6374fcfb53c..5cffec62595b0980e2d01067e67ea2657983b20f 100644 (file)
--- a/src/stringpool.c
+++ b/src/stringpool.c
@@ -22,10 +22,10 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 enum loc_stringpool_mode {
        STRINGPOOL_DEFAULT,

diff --git a/src/test-as.c b/src/test-as.c
index 2d61675f3866c04879cabad65a3e186d594432ae..91b62fd7651e4ef9406d6f0e98c87b3f4f8f8039 100644 (file)
--- a/src/test-as.c
+++ b/src/test-as.c
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/writer.h>
 
 #define TEST_AS_COUNT 5000
 

diff --git a/src/test-country.c b/src/test-country.c
index d78c773b07a7a18bbeb0ae2fd6f6f21037c58c4c..25e41651340a894c8214b50f1e95cbb1045cd0e7 100644 (file)
--- a/src/test-country.c
+++ b/src/test-country.c
@@ -21,11 +21,11 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
        struct loc_country* country;

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

diff --git a/src/test-libloc.c b/src/test-libloc.c
index e8c2ebf558ea3ccd0872446b339480533687777f..41512e1bf232b573f39dfff8be030614925c0ae4 100644 (file)
--- a/src/test-libloc.c
+++ b/src/test-libloc.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 int main(int argc, char** argv) {
        struct loc_ctx *ctx;

diff --git a/src/test-network-list.c b/src/test-network-list.c
index 6f32ff7ba1e7da4d1b4848f30b08c930b96cf03b..70a6b89bdee916c529ea01f245fe0446b1ddb4cb 100644 (file)
--- a/src/test-network-list.c
+++ b/src/test-network-list.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
 
 int main(int argc, char** argv) {
        int err;

diff --git a/src/test-network.c b/src/test-network.c
index dde13f1582dd32c662f6e9e722de7f849eca1af6..daa844f18c732708f9da251187d0481a56fc0ac6 100644 (file)
--- a/src/test-network.c
+++ b/src/test-network.c
@@ -22,10 +22,10 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
        int err;

diff --git a/src/test-signature.c b/src/test-signature.c
index 620517c922469708976f5afe41398043c0d92758..bc66c962631acc26b260ed737228650d87e093a7 100644 (file)
--- a/src/test-signature.c
+++ b/src/test-signature.c
@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
        int err;

diff --git a/src/test-stringpool.c b/src/test-stringpool.c
index 3c2890a0ae9fe7f599e61a99b336b224b24fe5c6..392aa29be85cc572fec52362d5726610b5375811 100644 (file)
--- a/src/test-stringpool.c
+++ b/src/test-stringpool.c
@@ -26,8 +26,8 @@
 #include <time.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/stringpool.h>
 
 static const char* characters = "012345789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 

diff --git a/src/writer.c b/src/writer.c
index 0b4f5b9e5f00026fa7ce2c8952f1ed3ef887ec62..5445c0542a1d2de65147b2958039a51206caaa71 100644 (file)
--- a/src/writer.c
+++ b/src/writer.c
@@ -31,15 +31,15 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/format.h>
-#include <loc/network.h>
-#include <loc/private.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/format.h>
+#include <libloc/network.h>
+#include <libloc/private.h>
+#include <libloc/writer.h>
 
 struct loc_writer {
        struct loc_ctx* ctx;