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


Ignore:
Timestamp:
2018-11-26T13:55:51Z (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/Makefile

    r5aa06ad rb501de7  
    3636        ../math/libmath.a \
    3737        ../clui/libclui.a \
     38        ../gui/libgui.a \
     39        ../draw/libdraw.a \
     40        ../softrend/libsoftrend.a \
     41        ../hound/libhound.a \
     42        ../pcm/libpcm.a \
    3843        $(LIBC_PREFIX)/libc.a \
    3944        $(LIBC_PREFIX)/crt0.o \
     
    9398include $(USPACE_PREFIX)/Makefile.common
    9499
    95 export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
     100export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc \
     101    $(EXPORT_DIR)/Makefile.common $(EXPORT_DIR)/Makefile.config
    96102
    97103$(EXPORT_DIR)/config.mk: export-libs export-includes
     
    111117        sed 's:$$(HELENOS_EXPORT_ROOT):$$HELENOS_EXPORT_ROOT:g' < $< >$@
    112118
     119$(EXPORT_DIR)/Makefile.common: ../../../Makefile.common
     120        cp $< $@
     121
     122$(EXPORT_DIR)/Makefile.config: ../../../Makefile.config
     123        cp $< $@
     124
    113125export-libs: $(EXPORT_FILES) export-includes
    114126        mkdir -p $(EXPORT_DIR)/lib
     
    124136        cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
    125137        rm -rf $(EXPORT_DIR)/include
     138        mkdir -p $(EXPORT_DIR)/include.new/libdraw
     139        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw ../draw/*.h
     140        mkdir -p $(EXPORT_DIR)/include.new/libdraw/codec
     141        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw/codec ../draw/codec/*.h
     142        mkdir -p $(EXPORT_DIR)/include.new/libgui
     143        cp -L -t $(EXPORT_DIR)/include.new/libgui ../gui/*.h
     144        mkdir -p $(EXPORT_DIR)/include.new/libhound
     145        cp -r -L -t $(EXPORT_DIR)/include.new/libhound ../hound/include/*
     146        mkdir -p $(EXPORT_DIR)/include.new/libpcm
     147        cp -r -L -t $(EXPORT_DIR)/include.new/libpcm ../pcm/include/*
    126148        mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include
Note: See TracChangeset for help on using the changeset viewer.