Changeset 9b8be79 in mainline for uspace/lib/posix/Makefile

Timestamp:

2018-09-18T14:50:22Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

460ea7e

Parents:

7570a95f

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-14 17:49:49)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-18 14:50:22)

Message:

libposix: Change header organization and remove passthrough headers

Posix headers now function like an overlay. The system include directories
are searched after posix directories. The headers don't need to be patched
for export now. libposix files now include headers using bracket notation
instead of quoted notation.

File:

• uspace/lib/posix/Makefile (modified) (4 diffs)

uspace/lib/posix/Makefile

@@ -31 +31 @@
 LIBRARY = libposix
 
-EXTRA_CFLAGS = -Iinclude/
-
-INCLUDE_LIBC = ./include/libc
+EXTRA_CFLAGS = -Iinclude/posix
 
 EXPORT_FILES = \
@@ -77 +75 @@
 
 EXPORT_CPPFLAGS = \
-        -isystem $$(HELENOS_EXPORT_ROOT)/include \
+        -isystem $$(HELENOS_EXPORT_ROOT)/include/posix \
+        -isystem $$(HELENOS_EXPORT_ROOT)/include/libc \
+        -idirafter $$(HELENOS_EXPORT_ROOT)/include \
         $(COMMON_CPPFLAGS)
 
@@ -92 +92 @@
 
 include $(USPACE_PREFIX)/Makefile.common
-
-$(INCLUDE_LIBC): $(shell find ../c/include -name '*.h')
-        cp -r -L --remove-destination -T ../c/include $@
-        find ../c/include -type f -and -not -name '*.h' -delete
 
 export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
@@ -122 +118 @@
         mkdir -p $(EXPORT_DIR)/include
         rm -rf $(EXPORT_DIR)/include.new
-        cp -r -L -T ./include/posix $(EXPORT_DIR)/include.new
-        cp -r -L -T ./include/libc $(EXPORT_DIR)/include.new/libc
-        cp -r -L ../c/arch/$(UARCH)/include/* $(EXPORT_DIR)/include.new/libc
+        cp -r -L -T ./include $(EXPORT_DIR)/include.new
+        cp -r -L ../c/arch/$(UARCH)/include/libarch $(EXPORT_DIR)/include.new/libc
         cp -r -L $(ROOT_PATH)/abi/include/* $(EXPORT_DIR)/include.new
         mkdir -p $(EXPORT_DIR)/include.new/libclui
         cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
-
-        find "$(EXPORT_DIR)/include.new/libc" "$(EXPORT_DIR)/include.new/libclui" -name '*.h' -exec sed \
-                -e 's:#include <:#include <libc/:' \
-                -e 's:#include <libc/abi/:#include <abi/:' \
-                -e 's:#include <libc/_bits/:#include <_bits/:' \
-                -e 's:#include <libc/libc/:#include <libc/:' \
-                -i {} \;
-        find "$(EXPORT_DIR)/include.new" -name '*.h' -exec sed \
-                -e 's:#include "posix/:#include ":' \
-                -e 's:#include <posix/:#include <:' \
-                -i {} \;
-
         rm -rf $(EXPORT_DIR)/include
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include