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


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    rd54b303 r21365c0  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
    33 INCLUDE_ABI = include/abi
    34 INCLUDE_LIBARCH = include/libarch
    35 
    36 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    37 COMMON_HEADER = $(ROOT_PATH)/common.h
    38 COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
    39 
    4033CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     34COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
    4135
    4236LINKER_SCRIPTS = \
    … …  
    4640        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4741
    48 PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
     42PRE_DEPEND = $(COMMON_HEADER_ARCH)
    4943EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    50 EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     44EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5145LIBRARY = libc
    5246SLIBRARY = libc.so.0.0
    5347LSONAME = libc.so0
    5448
    55 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    56 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    57 
    58 
    59 -include $(COMMON_MAKEFILE)
    6049-include $(CONFIG_MAKEFILE)
    6150-include arch/$(UARCH)/Makefile.inc
     51
     52ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
     53ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
     54ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
     55
     56PRE_DEPEND += $(ARCH_AUTOGENS_H)
     57EXTRA_CLEAN += $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
    6258
    6359GENERIC_SOURCES = \
    … …  
    7066        generic/cfg.c \
    7167        generic/clipboard.c \
     68        generic/corecfg.c \
    7269        generic/devman.c \
    7370        generic/device/hw_res.c \
    7471        generic/device/hw_res_parsed.c \
    75         generic/device/char_dev.c \
     72        generic/device/pio_window.c \
    7673        generic/device/clock_dev.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 \
     74        generic/device/led_dev.c \
     75        generic/dhcp.c \
     76        generic/dnsr.c \
    8277        generic/dlfcn.c \
    8378        generic/elf/elf_load.c \
    … …  
    9388        generic/pcb.c \
    9489        generic/smc.c \
    95         generic/smp_memory_barrier.c \
    9690        generic/thread.c \
    9791        generic/tls.c \
    9892        generic/task.c \
    9993        generic/futex.c \
     94        generic/inet/addr.c \
    10095        generic/inet.c \
    10196        generic/inetcfg.c \
    … …  
    10499        generic/io/input.c \
    105100        generic/io/io.c \
     101        generic/io/chardev.c \
     102        generic/io/chardev_srv.c \
    106103        generic/io/chargrid.c \
    107104        generic/io/output.c \
    … …  
    109106        generic/io/log.c \
    110107        generic/io/logctl.c \
     108        generic/io/kio.c \
    111109        generic/io/klog.c \
    112110        generic/io/snprintf.c \
    … …  
    120118        generic/iplink.c \
    121119        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 \
    132133        generic/adt/list.c \
    133134        generic/adt/hash_table.c \
    … …  
    137138        generic/time.c \
    138139        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 \
    146147        generic/stack.c \
    147148        generic/stacktrace.c \
    … …  
    166167include $(USPACE_PREFIX)/Makefile.common
    167168
    168 $(INCLUDE_LIBARCH): arch/$(UARCH)/include
    169         ln -sfn ../$< $@
    170 
    171 $(INCLUDE_ABI): ../../../abi/include/
    172         ln -sfn ../$< $@
     169%.h: %.ag
     170        $(AUTOGEN) probe $< >$<.probe.c
     171        $(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
     172        $(AUTOGEN) generate $< <$<.probe.s >$@   
    173173
    174174$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    175         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
     175        $(CC) $(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         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
     178        $(CC) $(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         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
     181        $(CC) $(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         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
     184        $(CC) $(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.