Changes in uspace/lib/posix/Makefile [2bb6d04:ea4910b] in mainline

File:

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

uspace/lib/posix/Makefile

@@ -41 +41 @@
         ../hound/libhound.a \
         ../pcm/libpcm.a \
-        ../cpp/libcpp.a \
         $(LIBC_PREFIX)/libc.a \
         $(LIBC_PREFIX)/crt0.o \
         $(LIBC_PREFIX)/crt1.o \
         $(LIBRARY).a
+
+PRE_DEPEND = $(INCLUDE_LIBC)
+EXTRA_CLEAN = $(INCLUDE_LIBC)
 
 SOURCES = \
@@ -94 +96 @@
         $(COMMON_CFLAGS)
 
-EXPORT_CXXFLAGS = \
-        $(COMMON_CXXFLAGS)
-
 include $(USPACE_PREFIX)/Makefile.common
 
@@ -110 +109 @@
         echo 'HELENOS_CPPFLAGS="$(EXPORT_CPPFLAGS)"' >> $@.new
         echo 'HELENOS_CFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
-        echo 'HELENOS_CXXFLAGS="$(EXPORT_CXXFLAGS)"' >> $@.new
+        echo 'HELENOS_CXXFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
         echo 'HELENOS_LDFLAGS="$(EXPORT_LDFLAGS)"' >> $@.new
         echo 'HELENOS_LDLIBS="$(EXPORT_LDLIBS)"' >> $@.new
@@ -128 +127 @@
         cp -L $(EXPORT_FILES) $(EXPORT_DIR)/lib
 
-export-includes: $(shell find ./include ../c/arch/$(UARCH)/include $(ROOT_PATH)/abi/include -name '*.h')
+export-includes: $(INCLUDE_LIBC) $(shell find ./include ../c/arch/$(UARCH)/include $(ROOT_PATH)/abi/include -name '*.h')
         mkdir -p $(EXPORT_DIR)/include
         rm -rf $(EXPORT_DIR)/include.new
@@ -138 +137 @@
         rm -rf $(EXPORT_DIR)/include
         mkdir -p $(EXPORT_DIR)/include.new/libdraw
-        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw ../draw/include/*
+        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
@@ -145 +146 @@
         mkdir -p $(EXPORT_DIR)/include.new/libpcm
         cp -r -L -t $(EXPORT_DIR)/include.new/libpcm ../pcm/include/*
-        mkdir -p $(EXPORT_DIR)/include.new/libcpp
-        cp -r -L -t $(EXPORT_DIR)/include.new/libcpp ../cpp/include/*
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include