1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-17 10:33:49 +01:00

posix: consolidate include paths

This commit is contained in:
Martine Lenders 2015-08-11 20:02:10 +02:00 committed by Martine Lenders
parent f3c096084b
commit a4905b72d4
9 changed files with 11 additions and 13 deletions

View File

@ -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> From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Thu, 31 Oct 2013 13:36:10 +0100 Date: Thu, 31 Oct 2013 13:36:10 +0100
Subject: [PATCH 1/8] Add RIOT Makefile Subject: [PATCH 1/8] Add RIOT Makefile
--- ---
Makefile | 5 +++++ Makefile | 4 ++++
1 file changed, 5 insertions(+) 1 file changed, 4 insertions(+)
create mode 100644 Makefile create mode 100644 Makefile
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
new file mode 100644 new file mode 100644
index 0000000..f90baa1 index 0000000..7f37ccc
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1,5 @@ @@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR)) +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 +CFLAGS += -DWITH_POSIX
+ +
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
-- --
1.8.3.2 1.9.1

View File

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

View File

@ -8,7 +8,7 @@ endif
ifneq ($(RIOTBASE),) ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \ 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 endif
MODULE:=$(shell basename $(CURDIR)) MODULE:=$(shell basename $(CURDIR))

View File

@ -9,7 +9,7 @@ endif
ifneq ($(RIOTBASE),) ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \ 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 endif
.PHONY: all clean patch reset .PHONY: all clean patch reset

View File

@ -8,7 +8,7 @@ endif
ifneq ($(RIOTBASE),) ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \ 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 endif
MODULE:=$(shell basename $(CURDIR)) MODULE:=$(shell basename $(CURDIR))

View File

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