Browse Source

posix: consolidate include paths

dev/timer
Martine Lenders 8 years ago committed by Martine Lenders
parent
commit
a4905b72d4
  1. 15
      pkg/libcoap/0001-Add-RIOT-Makefile.patch
  2. 1
      pkg/libcoap/Makefile.include
  3. 2
      pkg/micro-ecc/Makefile
  4. 2
      pkg/microcoap/Makefile
  5. 2
      pkg/oonf_api/Makefile
  6. 2
      sys/Makefile.include
  7. 0
      sys/posix/include/arpa/inet.h
  8. 0
      sys/posix/include/netinet/in.h
  9. 0
      sys/posix/include/sys/socket.h

15
pkg/libcoap/0001-Add-RIOT-Makefile.patch

@ -1,24 +1,23 @@
From b3ef68af33cb65f36666a416b71d7eb768715eca Mon Sep 17 00:00:00 2001
From bc86f013bbfc1eca7151d4faa2bb9ca33987115c Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Thu, 31 Oct 2013 13:36:10 +0100
Subject: [PATCH 1/8] Add RIOT Makefile
---
Makefile | 5 +++++
1 file changed, 5 insertions(+)
Makefile | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f90baa1
index 0000000..7f37ccc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm7_common/include -I$(RIOTBASE)/sys/net/transport_layer/include -I$(RIOTBASE)/sys/net/sixlowpan/include/ -I$(RIOTBASE)/sys/net/ieee802154/include -I$(RIOTBASE)/sys/net/net_help -I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
+CFLAGS += -DWITH_POSIX
+
+include $(RIOTBASE)/Makefile.base
--
1.8.3.2
--
1.9.1

1
pkg/libcoap/Makefile.include

@ -1,4 +1,3 @@
INCLUDES += -I$(RIOTBASE)/pkg/libcoap/libcoap \
-I$(RIOTBASE)/sys/posix/include \
-I$(RIOTBASE)/sys/posix/pnet/include \
-I$(RIOTBASE)/sys/net/include

2
pkg/micro-ecc/Makefile

@ -8,7 +8,7 @@ endif
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
-I$(RIOTBASE)/sys/posix/include
endif
MODULE:=$(shell basename $(CURDIR))

2
pkg/microcoap/Makefile

@ -9,7 +9,7 @@ endif
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
-I$(RIOTBASE)/sys/posix/include
endif
.PHONY: all clean patch reset

2
pkg/oonf_api/Makefile

@ -8,7 +8,7 @@ endif
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
-I$(RIOTBASE)/sys/posix/include
endif
MODULE:=$(shell basename $(CURDIR))

2
sys/Makefile.include

@ -14,7 +14,7 @@ ifneq (,$(filter posix,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif
ifneq (,$(filter pnet,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/pnet/include
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif
ifneq (,$(filter pthread,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/pthread/include

0
sys/posix/pnet/include/arpa/inet.h → sys/posix/include/arpa/inet.h

0
sys/posix/pnet/include/netinet/in.h → sys/posix/include/netinet/in.h

0
sys/posix/pnet/include/sys/socket.h → sys/posix/include/sys/socket.h

Loading…
Cancel
Save