posix: consolidate include paths

RIOT-OS · Aug 11, 2015 · bf577cc · bf577cc
1 parent 9755d6e
commit bf577cc
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 6 deletions.
diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
@@ -15,7 +15,7 @@ index 0000000..f90baa1
 +++ b/Makefile
 @@ -0,0 +1,5 @@
 +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
++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
 +CFLAGS += -DWITH_POSIX
 +
 +include $(RIOTBASE)/Makefile.base

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → sys/posix/include/arpa/inet.h b/sys/posix/pnet/include/arpa/inet.h → sys/posix/include/arpa/inet.h
diff --git a/sys/posix/pnet/include/netinet/in.h → sys/posix/include/netinet/in.h b/sys/posix/pnet/include/netinet/in.h → sys/posix/include/netinet/in.h
diff --git a/sys/posix/pnet/include/sys/socket.h → sys/posix/include/sys/socket.h b/sys/posix/pnet/include/sys/socket.h → sys/posix/include/sys/socket.h