From: Michael Tremer Date: Sat, 4 Sep 2021 13:38:44 +0000 (+0000) Subject: Move include files to /usr/include/libloc X-Git-Tag: 0.9.8~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c12a1385e4a21211f0bd07104525a8858a3aea13;p=location%2Flibloc.git 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 --- diff --git a/Makefile.am b/Makefile.am index dbdfd8e..2c55f0a 100644 --- 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 5acbb8a..820357c 100644 --- a/src/as-list.c +++ b/src/as-list.c @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct loc_as_list { struct loc_ctx* ctx; diff --git a/src/as.c b/src/as.c index 757bf3d..2cbd5c8 100644 --- a/src/as.c +++ b/src/as.c @@ -24,12 +24,12 @@ # include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include struct loc_as { struct loc_ctx* ctx; diff --git a/src/country-list.c b/src/country-list.c index 103536c..6c49533 100644 --- a/src/country-list.c +++ b/src/country-list.c @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct loc_country_list { struct loc_ctx* ctx; diff --git a/src/country.c b/src/country.c index 3ad3aac..957ce2e 100644 --- a/src/country.c +++ b/src/country.c @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include struct loc_country { struct loc_ctx* ctx; diff --git a/src/database.c b/src/database.c index 6cfefee..61b6078 100644 --- a/src/database.c +++ b/src/database.c @@ -36,18 +36,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct loc_database { struct loc_ctx* ctx; diff --git a/src/libloc.c b/src/libloc.c index 0f22279..1fee08e 100644 --- a/src/libloc.c +++ b/src/libloc.c @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include 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 7b5c4e8..77ac872 100644 --- 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 -#include +#include +#include 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 b4c8e1d..05e0188 100644 --- a/src/loc/as.h +++ b/src/libloc/as.h @@ -19,9 +19,9 @@ #include -#include -#include -#include +#include +#include +#include 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 a7f818a..c42b66f 100644 --- a/src/loc/country-list.h +++ b/src/libloc/country-list.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include 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 d09daee..4cc3a05 100644 --- a/src/loc/country.h +++ b/src/libloc/country.h @@ -17,9 +17,9 @@ #ifndef LIBLOC_COUNTRY_H #define LIBLOC_COUNTRY_H -#include -#include -#include +#include +#include +#include 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 9d1f71a..8eab24d 100644 --- a/src/loc/database.h +++ b/src/libloc/database.h @@ -21,11 +21,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include 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 308b262..988a8a0 100644 --- 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 +#include 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 9e452bf..030d036 100644 --- a/src/loc/network.h +++ b/src/libloc/network.h @@ -19,9 +19,9 @@ #include -#include -#include -#include +#include +#include +#include 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 6b98d1c..de4b9ae 100644 --- a/src/loc/private.h +++ b/src/libloc/private.h @@ -24,7 +24,7 @@ #include #include -#include +#include 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 3b70c60..dd13d60 100644 --- a/src/loc/resolv.h +++ b/src/libloc/resolv.h @@ -19,7 +19,7 @@ #include -#include +#include 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 8068242..932aad7 100644 --- a/src/loc/stringpool.h +++ b/src/libloc/stringpool.h @@ -22,7 +22,7 @@ #include #include -#include +#include 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 f106a94..eae9548 100644 --- a/src/loc/writer.h +++ b/src/libloc/writer.h @@ -19,11 +19,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct loc_writer; diff --git a/src/network-list.c b/src/network-list.c index 224b345..58aa11e 100644 --- a/src/network-list.c +++ b/src/network-list.c @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct loc_network_list { struct loc_ctx* ctx; diff --git a/src/network.c b/src/network.c index 24c593d..7b1bc7c 100644 --- a/src/network.c +++ b/src/network.c @@ -25,12 +25,12 @@ # include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include struct loc_network { struct loc_ctx* ctx; diff --git a/src/perl/Location.xs b/src/perl/Location.xs index 73f85b4..6f21f2b 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -6,10 +6,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include MODULE = Location PACKAGE = Location diff --git a/src/python/as.c b/src/python/as.c index 2e111b5..4cf9987 100644 --- a/src/python/as.c +++ b/src/python/as.c @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include "locationmodule.h" #include "as.h" diff --git a/src/python/as.h b/src/python/as.h index 5bc7240..d7fe36a 100644 --- a/src/python/as.h +++ b/src/python/as.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include typedef struct { PyObject_HEAD diff --git a/src/python/country.c b/src/python/country.c index 1247a08..4bb6a31 100644 --- a/src/python/country.c +++ b/src/python/country.c @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include "locationmodule.h" #include "country.h" diff --git a/src/python/country.h b/src/python/country.h index 3d787d9..346163c 100644 --- a/src/python/country.h +++ b/src/python/country.h @@ -19,8 +19,7 @@ #include -//#include -#include +#include typedef struct { PyObject_HEAD diff --git a/src/python/database.c b/src/python/database.c index 8de721f..ca56748 100644 --- a/src/python/database.c +++ b/src/python/database.c @@ -16,10 +16,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "locationmodule.h" #include "as.h" diff --git a/src/python/database.h b/src/python/database.h index b8c766e..88b839b 100644 --- a/src/python/database.h +++ b/src/python/database.h @@ -19,7 +19,7 @@ #include -#include +#include typedef struct { PyObject_HEAD diff --git a/src/python/locationmodule.c b/src/python/locationmodule.c index 5dd4ec6..15f661b 100644 --- a/src/python/locationmodule.c +++ b/src/python/locationmodule.c @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include "locationmodule.h" #include "as.h" diff --git a/src/python/locationmodule.h b/src/python/locationmodule.h index 2f4d652..e267986 100644 --- 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 -#include +#include extern struct loc_ctx* loc_ctx; diff --git a/src/python/network.c b/src/python/network.c index 5b1369d..9dc6ab6 100644 --- a/src/python/network.c +++ b/src/python/network.c @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "locationmodule.h" #include "network.h" diff --git a/src/python/network.h b/src/python/network.h index 43665ba..b137e72 100644 --- a/src/python/network.h +++ b/src/python/network.h @@ -19,7 +19,7 @@ #include -#include +#include typedef struct { PyObject_HEAD diff --git a/src/python/writer.c b/src/python/writer.c index a3ceae6..c54596a 100644 --- a/src/python/writer.c +++ b/src/python/writer.c @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include "locationmodule.h" #include "as.h" diff --git a/src/python/writer.h b/src/python/writer.h index 6fe4c8d..10ca26b 100644 --- a/src/python/writer.h +++ b/src/python/writer.h @@ -19,7 +19,7 @@ #include -#include +#include typedef struct { PyObject_HEAD diff --git a/src/resolv.c b/src/resolv.c index e42e9de..1c4cd75 100644 --- a/src/resolv.c +++ b/src/resolv.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include 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 49606de..5cffec6 100644 --- a/src/stringpool.c +++ b/src/stringpool.c @@ -22,10 +22,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include enum loc_stringpool_mode { STRINGPOOL_DEFAULT, diff --git a/src/test-as.c b/src/test-as.c index 2d61675..91b62fd 100644 --- a/src/test-as.c +++ b/src/test-as.c @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define TEST_AS_COUNT 5000 diff --git a/src/test-country.c b/src/test-country.c index d78c773..25e4165 100644 --- a/src/test-country.c +++ b/src/test-country.c @@ -21,11 +21,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include int main(int argc, char** argv) { struct loc_country* country; diff --git a/src/test-database.c b/src/test-database.c index da4b11c..92a415f 100644 --- a/src/test-database.c +++ b/src/test-database.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include const char* VENDOR = "Test Vendor"; const char* DESCRIPTION = diff --git a/src/test-libloc.c b/src/test-libloc.c index e8c2ebf..41512e1 100644 --- a/src/test-libloc.c +++ b/src/test-libloc.c @@ -24,7 +24,7 @@ #include #include -#include +#include 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 6f32ff7..70a6b89 100644 --- a/src/test-network-list.c +++ b/src/test-network-list.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include int main(int argc, char** argv) { int err; diff --git a/src/test-network.c b/src/test-network.c index dde13f1..daa844f 100644 --- a/src/test-network.c +++ b/src/test-network.c @@ -22,10 +22,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int main(int argc, char** argv) { int err; diff --git a/src/test-signature.c b/src/test-signature.c index 620517c..bc66c96 100644 --- a/src/test-signature.c +++ b/src/test-signature.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include int main(int argc, char** argv) { int err; diff --git a/src/test-stringpool.c b/src/test-stringpool.c index 3c2890a..392aa29 100644 --- a/src/test-stringpool.c +++ b/src/test-stringpool.c @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include static const char* characters = "012345789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; diff --git a/src/writer.c b/src/writer.c index 0b4f5b9..5445c05 100644 --- a/src/writer.c +++ b/src/writer.c @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct loc_writer { struct loc_ctx* ctx;