Commit c12a1385 authored by Michael Tremer's avatar Michael Tremer

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: default avatarMichael Tremer <michael.tremer@ipfire.org>
parent 8c37d8a7
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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
......
......@@ -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, ...) {}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -19,8 +19,7 @@
#include <Python.h>
//#include <loc/libloc.h>
#include <loc/country.h>
#include <libloc/country.h>
typedef struct {
PyObject_HEAD
......
......@@ -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"
......
......@@ -19,7 +19,7 @@
#include <Python.h>
#include <loc/database.h>
#include <libloc/database.h>
typedef struct {
PyObject_HEAD
......
......@@ -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"
......
......@@ -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;
......
......@@ -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"
......
......@@ -19,7 +19,7 @@
#include <Python.h>
#include <loc/network.h>
#include <libloc/network.h>
typedef struct {
PyObject_HEAD
......
......@@ -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"
......
......@@ -19,7 +19,7 @@
#include <Python.h>
#include <loc/writer.h>
#include <libloc/writer.h>
typedef struct {
PyObject_HEAD
......
......@@ -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;
......
......@@ -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,
......
......@@ -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
......
......@@ -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;
......
......@@ -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 =
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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";
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment