Changeset 4c53333 in mainline for uspace/lib/c/Makefile


Ignore:
Timestamp:
2013-07-11T08:21:10Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
64e63ce1
Parents:
80445cf (diff), c8bb1633 (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/c/Makefile

    r80445cf r4c53333  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
    33 INCLUDE_ABI = include/abi
    34 INCLUDE_LIBARCH = include/libarch
    35 
    3633COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    3734COMMON_HEADER = $(ROOT_PATH)/common.h
    38 COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
     35COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
    3936
    4037CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    … …  
    4643        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4744
    48 PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
     45PRE_DEPEND = $(COMMON_HEADER_ARCH)
    4946EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    50 EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     47EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5148LIBRARY = libc
    5249SLIBRARY = libc.so.0.0
    … …  
    6259        generic/ddi.c \
    6360        generic/as.c \
     61        generic/bd.c \
     62        generic/bd_srv.c \
     63        generic/bitops.c \
    6464        generic/cap.c \
    6565        generic/cfg.c \
    … …  
    6969        generic/device/hw_res_parsed.c \
    7070        generic/device/char_dev.c \
     71        generic/device/clock_dev.c \
     72        generic/device/battery_dev.c \
     73        generic/device/graph_dev.c \
    7174        generic/device/nic.c \
    7275        generic/device/pci.c \
     76        generic/device/ahci.c \
     77        generic/dnsr.c \
     78        generic/dlfcn.c \
    7379        generic/elf/elf_load.c \
    7480        generic/event.c \
    … …  
    8793        generic/task.c \
    8894        generic/futex.c \
     95        generic/inet/addr.c \
    8996        generic/inet.c \
    9097        generic/inetcfg.c \
    9198        generic/inetping.c \
     99        generic/inetping6.c \
    92100        generic/io/asprintf.c \
     101        generic/io/input.c \
    93102        generic/io/io.c \
     103        generic/io/chargrid.c \
     104        generic/io/output.c \
    94105        generic/io/printf.c \
    95106        generic/io/log.c \
     107        generic/io/logctl.c \
    96108        generic/io/klog.c \
    97109        generic/io/snprintf.c \
    … …  
    99111        generic/io/vsnprintf.c \
    100112        generic/io/printf_core.c \
     113        generic/io/con_srv.c \
    101114        generic/io/console.c \
     115        generic/io/visualizer.c \
     116        generic/io/window.c \
    102117        generic/iplink.c \
    103118        generic/iplink_srv.c \
     119        generic/ieee_double.c \
     120        generic/power_of_ten.c \
     121        generic/double_to_str.c \
    104122        generic/malloc.c \
    105123        generic/sysinfo.c \
    … …  
    111129        generic/adt/list.c \
    112130        generic/adt/hash_table.c \
    113         generic/adt/hash_set.c \
    114131        generic/adt/dynamic_fifo.c \
    115132        generic/adt/char_map.c \
    … …  
    122139        generic/vfs/canonify.c \
    123140        generic/net/inet.c \
    124         generic/net/modules.c \
    125141        generic/net/socket_client.c \
    126142        generic/net/socket_parse.c \
     143        generic/stack.c \
    127144        generic/stacktrace.c \
    128145        generic/arg_parse.c \
    129146        generic/sort.c \
    130147        generic/stats.c \
    131         generic/assert.c
     148        generic/assert.c \
     149        generic/pio_trace.c
    132150
    133151ifeq ($(CONFIG_RTLD),y)
    134152        GENERIC_SOURCES += \
    135                 generic/dlfcn.c \
    136153                generic/rtld/rtld.c \
    137154                generic/rtld/dynamic.c \
    … …  
    146163include $(USPACE_PREFIX)/Makefile.common
    147164
    148 $(INCLUDE_LIBARCH): arch/$(UARCH)/include
    149         ln -sfn ../$< $@
    150 
    151 $(INCLUDE_ABI): ../../../abi/include/
    152         ln -sfn ../$< $@
    153165
    154166$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    155         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
     167        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
    156168
    157169$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    158         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
     170        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
    159171
    160172$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    161         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
     173        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
    162174
    163175$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    164         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
     176        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
    165177
    166178$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    167         ln -sfn ../../../$< $@
     179        ln -sfn ../../../../$< $@
Note: See TracChangeset for help on using the changeset viewer.