Changeset b501de7 in mainline for uspace/lib/posix/Makefile

Timestamp:

2018-11-26T13:55:51Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b555f0f

Parents:

5aa06ad

git-author:

Jiri Svoboda <jiri@…> (2018-11-25 17:54:21)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-26 13:55:51)

Message:

XCW should rely on export dir instead of touching the source tree. Allow specifying alternate export dir. Add more exported libraries (yes, I know).

File:

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

uspace/lib/posix/Makefile

@@ -36 +36 @@
         ../math/libmath.a \
         ../clui/libclui.a \
+        ../gui/libgui.a \
+        ../draw/libdraw.a \
+        ../softrend/libsoftrend.a \
+        ../hound/libhound.a \
+        ../pcm/libpcm.a \
         $(LIBC_PREFIX)/libc.a \
         $(LIBC_PREFIX)/crt0.o \
@@ -93 +98 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
+export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc \
+    $(EXPORT_DIR)/Makefile.common $(EXPORT_DIR)/Makefile.config
 
 $(EXPORT_DIR)/config.mk: export-libs export-includes
@@ -111 +117 @@
         sed 's:$$(HELENOS_EXPORT_ROOT):$$HELENOS_EXPORT_ROOT:g' < $< >$@
 
+$(EXPORT_DIR)/Makefile.common: ../../../Makefile.common
+        cp $< $@
+
+$(EXPORT_DIR)/Makefile.config: ../../../Makefile.config
+        cp $< $@
+
 export-libs: $(EXPORT_FILES) export-includes
         mkdir -p $(EXPORT_DIR)/lib
@@ -124 +136 @@
         cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
         rm -rf $(EXPORT_DIR)/include
+        mkdir -p $(EXPORT_DIR)/include.new/libdraw
+        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw ../draw/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libdraw/codec
+        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw/codec ../draw/codec/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libgui
+        cp -L -t $(EXPORT_DIR)/include.new/libgui ../gui/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libhound
+        cp -r -L -t $(EXPORT_DIR)/include.new/libhound ../hound/include/*
+        mkdir -p $(EXPORT_DIR)/include.new/libpcm
+        cp -r -L -t $(EXPORT_DIR)/include.new/libpcm ../pcm/include/*
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include