moved system headers into ./include/ so that they can be included fro…

…m within the project using #include <file>
attie · Mar 6, 2016 · 8eb6351 · 8eb6351
1 parent 07579ae
commit 8eb6351
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 5 deletions.
diff --git a/xbee.h → include/xbee.h b/xbee.h → include/xbee.h
diff --git a/xbeep.h → include/xbeep.h b/xbeep.h → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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