From 8eb6351601050a5b7c3a1b59c7132566a2abdcf7 Mon Sep 17 00:00:00 2001
From: Attie Grande <attie@attie.co.uk>
Date: Sun, 6 Mar 2016 12:50:57 +0000
Subject: [PATCH] moved system headers into ./include/ so that they can be
 included from within the project using #include <file>

---
 xbee.h => include/xbee.h   | 0
 xbeep.h => include/xbeep.h | 2 --
 internal.h                 | 5 ++++-
 make/install.darwin.mk     | 2 +-
 make/install.unix.mk       | 2 +-
 make/libconfig.mk          | 1 +
 make/os.darwin.mk          | 1 +
 make/os.freebsd.mk         | 1 +
 make/os.linux.mk           | 1 +
 9 files changed, 10 insertions(+), 5 deletions(-)
 rename xbee.h => include/xbee.h (100%)
 rename xbeep.h => include/xbeep.h (99%)

diff --git a/xbee.h b/include/xbee.h
similarity index 100%
rename from xbee.h
rename to include/xbee.h
diff --git a/xbeep.h b/include/xbeep.h
similarity index 99%
rename from xbeep.h
rename to include/xbeep.h
index 602d219..f545a34 100644
--- a/xbeep.h
+++ b/include/xbeep.h
@@ -30,9 +30,7 @@
 #include <vector>
 #include <stdarg.h>
 
-#ifndef __XBEE_H
 #include <xbee.h>
-#endif
 
 #ifndef EXPORT
 #define EXPORT
diff --git a/internal.h b/internal.h
index c00c549..73ccd25 100644
--- a/internal.h
+++ b/internal.h
@@ -37,7 +37,10 @@ struct xbee_rxInfo;
 struct xbee_interface;
 
 #include "xsys.h"
-#include "xbee.h"
+
+/* include xbee,h after xsys.h for in-project builds, as EXPORT is defined from xsys.h */
+#include <xbee.h>
+
 #include "mutex.h"
 
 struct xbee_buf {
diff --git a/make/install.darwin.mk b/make/install.darwin.mk
index 29545fc..8eed714 100644
--- a/make/install.darwin.mk
+++ b/make/install.darwin.mk
@@ -6,7 +6,7 @@ $(SYS_LIBDIR)/$(LIBNAME)%.$(LIBFULLREV): $(DESTDIR)/$(LIBNAME)%.$(LIBFULLREV)
 $(SYS_LIBDIR)/$(LIBNAME)%: $(SYS_LIBDIR)/$(LIBNAME)%.$(LIBFULLREV)
 	$(SYMLINK) -fs $(shell basename $^) $@
 
-$(addprefix $(SYS_INCDIR)/,$(SYS_HEADERS)): $(SYS_INCDIR)/%: %
+$(addprefix $(SYS_INCDIR)/,$(SYS_HEADERS)): $(SYS_INCDIR)/%: $(HDRDIR)/%
 	$(INSTALL) -m 644 $^ $@
 
 $(addprefix $(SYS_MANDIR)/,$(addsuffix .gz,$(SYS_MANPAGES))): $(SYS_MANDIR)/%.gz: $(MANDIR)/%
diff --git a/make/install.unix.mk b/make/install.unix.mk
index f4d76c3..2f828f1 100644
--- a/make/install.unix.mk
+++ b/make/install.unix.mk
@@ -9,7 +9,7 @@ $(SYS_LIBDIR)/$(LIBNAME)%.$(LIBFULLREV): $(DESTDIR)/$(LIBNAME)%.$(LIBFULLREV)
 $(SYS_LIBDIR)/$(LIBNAME)%: $(SYS_LIBDIR)/$(LIBNAME)%.$(LIBFULLREV)
 	$(SYMLINK) -fs $(shell basename $^) $@
 
-$(addprefix $(SYS_INCDIR)/,$(SYS_HEADERS)): $(SYS_INCDIR)/%: %
+$(addprefix $(SYS_INCDIR)/,$(SYS_HEADERS)): $(SYS_INCDIR)/%: $(HDRDIR)/%
 	$(INSTALL) -m 644 $^ $@
 
 $(addprefix $(SYS_MANDIR)/,$(addsuffix .gz,$(SYS_MANPAGES))): $(SYS_MANDIR)/%.gz: $(MANDIR)/%
diff --git a/make/libconfig.mk b/make/libconfig.mk
index ed86137..0f501b5 100644
--- a/make/libconfig.mk
+++ b/make/libconfig.mk
@@ -10,6 +10,7 @@ MANDIR:=               man
 HTMLDIR:=              html
 BUILDDIR:=             .build
 DESTDIR:=              lib
+HDRDIR:=               include
 
 CONSTRUCTIONDIRS:=     $(BUILDDIR) $(DESTDIR)
 
diff --git a/make/os.darwin.mk b/make/os.darwin.mk
index d388861..1f8bb32 100644
--- a/make/os.darwin.mk
+++ b/make/os.darwin.mk
@@ -19,6 +19,7 @@ MAN2HTML:=             man2html
 DEBUG:=                -g
 LIBS:=                 pthread
 CFLAGS+=               -Wall -c -fPIC $(DEBUG) $(addprefix -D,$(OPTIONS))
+CFLAGS+=               -I $(HDRDIR)
 #CFLAGS+=              -pedantic
 #CFLAGS+=               -fvisibility=hidden
 CFLAGS+=               -Wno-variadic-macros
diff --git a/make/os.freebsd.mk b/make/os.freebsd.mk
index 8545915..3529fb4 100644
--- a/make/os.freebsd.mk
+++ b/make/os.freebsd.mk
@@ -17,6 +17,7 @@ INSTALL=               install -g $(SYS_GROUP) -o $(SYS_USER)
 
 DEBUG:=                -g
 CFLAGS+=               -Wall -c -fPIC $(DEBUG) $(addprefix -D,$(OPTIONS))
+CFLAGS+=               -I $(HDRDIR)
 #CFLAGS+=              -pedantic
 CFLAGS+=               -fvisibility=hidden
 CFLAGS+=               -Wno-variadic-macros
diff --git a/make/os.linux.mk b/make/os.linux.mk
index 169e4a7..8b5d3dc 100644
--- a/make/os.linux.mk
+++ b/make/os.linux.mk
@@ -19,6 +19,7 @@ MAN2HTML:=             man2html
 DEBUG:=                -g
 LIBS:=                 pthread rt
 CFLAGS+=               -Wall -c -fPIC $(DEBUG) $(addprefix -D,$(OPTIONS)) -DLIBXBEE_BUILD
+CFLAGS+=               -I $(HDRDIR)
 #CFLAGS+=              -pedantic
 CFLAGS+=               -fvisibility=hidden
 CFLAGS+=               -Wno-variadic-macros