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


Ignore:
Timestamp:
2014-03-15T19:21:53Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c773adc
Parents:
2034f98 (diff), 8cffdf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/posix/Makefile

    r2034f98 rb0b4592e  
    3636
    3737INCLUDE_LIBC = ./include/libc
     38INCLUDE_LIBMATH = ./include/libmath
    3839
    3940LIBC_FILE = $(LIBC_PREFIX)/libc.a
    … …  
    4647COLLISIONS_LIST = collisions.list
    4748
    48 PRE_DEPEND = $(INCLUDE_LIBC)
     49PRE_DEPEND = $(INCLUDE_LIBC) $(INCLUDE_LIBMATH)
    4950EXTRA_CLEAN = \
    50         $(INCLUDE_LIBC) \
     51        $(INCLUDE_LIBC) $(INCLUDE_LIBMATH) \
    5152        $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX) \
    5253        $(COLLISIONS_LIST)
    … …  
    7374        source/string.c \
    7475        source/strings.c \
     76        source/sys/mman.c \
    7577        source/sys/stat.c \
    7678        source/sys/wait.c \
    … …  
    8183
    8284$(INCLUDE_LIBC): ../c/include
     85        ln -s -f -n ../$^ $@
     86
     87$(INCLUDE_LIBMATH): ../math/include
    8388        ln -s -f -n ../$^ $@
    8489
Note: See TracChangeset for help on using the changeset viewer.