From a4905b72d4cbf18f86bafa4ef9ea16a6d205c613 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Tue, 11 Aug 2015 20:02:10 +0200
Subject: [PATCH] posix: consolidate include paths
---
pkg/libcoap/0001-Add-RIOT-Makefile.patch | Bin 938 -> 516 bytes
pkg/libcoap/Makefile.include | 1 -
pkg/micro-ecc/Makefile | 2 +-
pkg/microcoap/Makefile | 2 +-
pkg/oonf_api/Makefile | 2 +-
sys/Makefile.include | 2 +-
sys/posix/{pnet => }/include/arpa/inet.h | 0
sys/posix/{pnet => }/include/netinet/in.h | 0
sys/posix/{pnet => }/include/sys/socket.h | 0
9 files changed, 4 insertions(+), 5 deletions(-)
rename sys/posix/{pnet => }/include/arpa/inet.h (100%)
rename sys/posix/{pnet => }/include/netinet/in.h (100%)
rename sys/posix/{pnet => }/include/sys/socket.h (100%)
diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
index f15c3ec0c39f5b7bd417560bbe242deed5749334..d1d3fa1d4f6baf2868903d46f95e941da6b07e19 100644
GIT binary patch
delta 114
zcmZ3*-om2mR+OKskd$m;mS$jRoRpN7Y?zvyXl`g~m|~Kam}r!gWSN|3Y;0*^ZfIzl
zJW+R*q=|wy5O66NDx_uRq$(t5B<7{3rsyb`O#E2HZk}dro}8RKIg3$~(PZ)zMy<(7
Q%yyg#T!wm<dWKwF0E?j@3jhEB
literal 938
zcmah{+m6~W5PkPo%mWXgkc$Z<H0oARF5O5_R$SCdRfQa90&Wv0%4HX%etey!Ahs%H
z<Oh#teCC`vp5|!+fsK*VXOV65!0AP{qk?s*6Sy>VF>sx}OMA!}%u@*~%z(OJS>Ee`
zj%86YRWKgRSzZc>Fhdz)Ucmb#KHUaFMn+WW0p_ugMu;ECn3d?kdSA7{rm*0p0-`oh
z+p`^yTA*3fvdF3mejqPB`1Ukhj~;=V{qHagLs<HYwVL-6BM~DZx~`K;3csKSS{(!^
z)D6J*OztpjtAdaPDw?S*np%qh&rvafBn=VNM5o)m;1CjuC<0yIi4vH3o(93?N+iCV
z23)--La9Hf1-*u0MDMJCF<Ns3GsI_8R&h)eyKA7q0CcOZWYcyJ1_Pqa7vs%r;ypB)
z#UA4r0#=}82|}Ye+APQZvehD*|9Ldqj3+D59zgdS&3Y>zhpS2JZDtn7!W5Fnl@j@;
z&*W*2H%ehHo|TJts+?159kwy<7(d?V<ymF2JaM-?O_EgJ=&DIdEX^`!vdGfB+{WyP
z`JL`U9OCpPV;5BOFNJ4Vfrx#pLwnsjh>F8jtvve&PL`^1|9O6@XSIqy>n7T0IvajE
mIW+#_uOGKhi<SSCXhb_Za^>6QXBoBM>dO#n^bOnS5b_%;ff*10
diff --git a/pkg/libcoap/Makefile.include b/pkg/libcoap/Makefile.include
index a6fb43a148..dab6b7a26a 100644
--- a/pkg/libcoap/Makefile.include
+++ b/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
diff --git a/pkg/micro-ecc/Makefile b/pkg/micro-ecc/Makefile
index 961ca7782e..4dfe2d2e2e 100644
--- a/pkg/micro-ecc/Makefile
+++ b/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))
diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile
index 16614b5ed7..4d2a4b6b0f 100644
--- a/pkg/microcoap/Makefile
+++ b/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
diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile
index 7b46f0acf1..b357ec1f7d 100644
--- a/pkg/oonf_api/Makefile
+++ b/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))
diff --git a/sys/Makefile.include b/sys/Makefile.include
index e55f67826a..f34f4247e2 100644
--- a/sys/Makefile.include
+++ b/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
diff --git a/sys/posix/pnet/include/arpa/inet.h b/sys/posix/include/arpa/inet.h
similarity index 100%
rename from sys/posix/pnet/include/arpa/inet.h
rename to sys/posix/include/arpa/inet.h
diff --git a/sys/posix/pnet/include/netinet/in.h b/sys/posix/include/netinet/in.h
similarity index 100%
rename from sys/posix/pnet/include/netinet/in.h
rename to sys/posix/include/netinet/in.h
diff --git a/sys/posix/pnet/include/sys/socket.h b/sys/posix/include/sys/socket.h
similarity index 100%
rename from sys/posix/pnet/include/sys/socket.h
rename to sys/posix/include/sys/socket.h
--
GitLab