Changes in uspace/lib/c/Makefile [21365c0:d54b303] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r21365c0 rd54b303  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
     33INCLUDE_ABI = include/abi
     34INCLUDE_LIBARCH = include/libarch
     35
     36COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     37COMMON_HEADER = $(ROOT_PATH)/common.h
     38COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
     39
    3340CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    34 COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
    3541
    3642LINKER_SCRIPTS = \
    … …  
    4046        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4147
    42 PRE_DEPEND = $(COMMON_HEADER_ARCH)
     48PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    4349EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    44 EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     50EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    4551LIBRARY = libc
    4652SLIBRARY = libc.so.0.0
    4753LSONAME = libc.so0
    4854
     55LIBS = $(LIBURCU_PREFIX)/liburcu.a
     56EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
     57
     58
     59-include $(COMMON_MAKEFILE)
    4960-include $(CONFIG_MAKEFILE)
    5061-include arch/$(UARCH)/Makefile.inc
    51 
    52 ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
    53 ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
    54 ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
    55 
    56 PRE_DEPEND += $(ARCH_AUTOGENS_H)
    57 EXTRA_CLEAN += $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
    5862
    5963GENERIC_SOURCES = \
    … …  
    6670        generic/cfg.c \
    6771        generic/clipboard.c \
    68         generic/corecfg.c \
    6972        generic/devman.c \
    7073        generic/device/hw_res.c \
    7174        generic/device/hw_res_parsed.c \
    72         generic/device/pio_window.c \
     75        generic/device/char_dev.c \
    7376        generic/device/clock_dev.c \
    74         generic/device/led_dev.c \
    75         generic/dhcp.c \
    76         generic/dnsr.c \
     77        generic/device/battery_dev.c \
     78        generic/device/graph_dev.c \
     79        generic/device/nic.c \
     80        generic/device/pci.c \
     81        generic/device/ahci.c \
    7782        generic/dlfcn.c \
    7883        generic/elf/elf_load.c \
    … …  
    8893        generic/pcb.c \
    8994        generic/smc.c \
     95        generic/smp_memory_barrier.c \
    9096        generic/thread.c \
    9197        generic/tls.c \
    9298        generic/task.c \
    9399        generic/futex.c \
    94         generic/inet/addr.c \
    95100        generic/inet.c \
    96101        generic/inetcfg.c \
    … …  
    99104        generic/io/input.c \
    100105        generic/io/io.c \
    101         generic/io/chardev.c \
    102         generic/io/chardev_srv.c \
    103106        generic/io/chargrid.c \
    104107        generic/io/output.c \
    … …  
    106109        generic/io/log.c \
    107110        generic/io/logctl.c \
    108         generic/io/kio.c \
    109111        generic/io/klog.c \
    110112        generic/io/snprintf.c \
    … …  
    118120        generic/iplink.c \
    119121        generic/iplink_srv.c \
    120         generic/irc.c \
    121         generic/irq.c \
    122122        generic/ieee_double.c \
    123123        generic/power_of_ten.c \
    … …  
    130130        generic/loader.c \
    131131        generic/getopt.c \
    132         generic/adt/checksum.c \
    133132        generic/adt/list.c \
    134133        generic/adt/hash_table.c \
    … …  
    138137        generic/time.c \
    139138        generic/stdlib.c \
     139        generic/mman.c \
    140140        generic/udebug.c \
    141141        generic/vfs/vfs.c \
    … …  
    144144        generic/net/socket_client.c \
    145145        generic/net/socket_parse.c \
    146         generic/setjmp.c \
    147146        generic/stack.c \
    148147        generic/stacktrace.c \
    … …  
    167166include $(USPACE_PREFIX)/Makefile.common
    168167
    169 %.h: %.ag
    170         $(AUTOGEN) probe $< >$<.probe.c
    171         $(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
    172         $(AUTOGEN) generate $< <$<.probe.s >$@   
     168$(INCLUDE_LIBARCH): arch/$(UARCH)/include
     169        ln -sfn ../$< $@
     170
     171$(INCLUDE_ABI): ../../../abi/include/
     172        ln -sfn ../$< $@
    173173
    174174$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    175         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
     175        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
    176176
    177177$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    178         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
     178        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
    179179
    180180$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    181         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
     181        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
    182182
    183183$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    184         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
     184        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
    185185
    186186$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    187         ln -sfn ../../../../$< $@
     187        ln -sfn ../../../$< $@
Note: See TracChangeset for help on using the changeset viewer.