diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2011-11-21 20:05:53 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-21 01:38:51 +0100 |
| commit | b45d75dcf7ad6b2633b61d862a8cafd4eaeb86b3 (patch) | |
| tree | 34249becb1018521188d3b9541299f8942d7b45f | |
| parent | ccf620f7f5ab2c5da518ab7871527d9c14a3272f (diff) | |
| download | libabc-b45d75dcf7ad6b2633b61d862a8cafd4eaeb86b3.tar.gz | |
src: use a separate include directory
Reduces name clash potential, and is clearer once one's project starts
to accumulate more header files.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | include/libabc/libabc.h (renamed from libabc/libabc.h) | 0 | ||||
| -rw-r--r-- | libabc/libabc-private.h | 2 | ||||
| -rw-r--r-- | libabc/libabc.c | 2 | ||||
| -rw-r--r-- | test-libabc.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 79be23f..032fafd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ AM_MAKEFLAGS = --no-print-directory AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ - -I$(top_srcdir)/libabc \ + -I${top_srcdir}/include -I${top_builddir}/include \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" @@ -22,11 +22,10 @@ LIBABC_CURRENT=2 LIBABC_REVISION=0 LIBABC_AGE=2 -include_HEADERS = libabc/libabc.h +pkginclude_HEADERS = include/libabc/libabc.h lib_LTLIBRARIES = libabc/libabc.la libabc_libabc_la_SOURCES =\ - libabc/libabc.h \ libabc/libabc-private.h \ libabc/libabc.c diff --git a/libabc/libabc.h b/include/libabc/libabc.h index 6942fc4..6942fc4 100644 --- a/libabc/libabc.h +++ b/include/libabc/libabc.h diff --git a/libabc/libabc-private.h b/libabc/libabc-private.h index 17a8c87..320cfad 100644 --- a/libabc/libabc-private.h +++ b/libabc/libabc-private.h @@ -24,7 +24,7 @@ #include <stdbool.h> #include <syslog.h> -#include "libabc.h" +#include <libabc/libabc.h> static inline void __attribute__((always_inline, format(printf, 2, 3))) abc_log_null(struct abc_ctx *ctx, const char *format, ...) {} diff --git a/libabc/libabc.c b/libabc/libabc.c index fc472b3..1df8154 100644 --- a/libabc/libabc.c +++ b/libabc/libabc.c @@ -27,7 +27,7 @@ #include <string.h> #include <ctype.h> -#include "libabc.h" +#include <libabc/libabc.h> #include "libabc-private.h" /** diff --git a/test-libabc.c b/test-libabc.c index 64e7100..7b2f2de 100644 --- a/test-libabc.c +++ b/test-libabc.c @@ -27,7 +27,7 @@ #include <errno.h> #include <unistd.h> -#include <libabc.h> +#include <libabc/libabc.h> int main(int argc, char *argv[]) { |