Changes in uspace/lib/c/Makefile [1a2befb:1d24ad3] in mainline

File:

• uspace/lib/c/Makefile (modified) (9 diffs)

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+COMMON_HEADER = $(ROOT_PATH)/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
+
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
-COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
 
 LINKER_SCRIPTS = \
@@ -45 +48 @@
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
-LSONAME = libc.so.0
+LSONAME = libc.so0
 
+
+-include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
-
-ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
-ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
-ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
-
-PRE_DEPEND += $(ARCH_AUTOGENS_H)
-EXTRA_CLEAN += $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
 
 GENERIC_SOURCES = \
@@ -64 +62 @@
         generic/bd_srv.c \
         generic/cap.c \
+        generic/cfg.c \
         generic/clipboard.c \
-        generic/config.c \
-        generic/corecfg.c \
         generic/devman.c \
         generic/device/hw_res.c \
         generic/device/hw_res_parsed.c \
-        generic/device/pio_window.c \
+        generic/device/char_dev.c \
         generic/device/clock_dev.c \
-        generic/device/led_dev.c \
-        generic/dhcp.c \
+        generic/device/battery_dev.c \
+        generic/device/graph_dev.c \
+        generic/device/nic.c \
+        generic/device/pci.c \
+        generic/device/ahci.c \
         generic/dnsr.c \
         generic/dlfcn.c \
         generic/elf/elf_load.c \
-        generic/elf/elf_mod.c \
         generic/event.c \
         generic/errno.c \
@@ -89 +88 @@
         generic/pcb.c \
         generic/smc.c \
-        generic/smp_memory_barrier.c \
         generic/thread.c \
         generic/tls.c \
         generic/task.c \
         generic/futex.c \
-        generic/imath.c \
         generic/inet/addr.c \
-        generic/inet/endpoint.c \
-        generic/inet/host.c \
-        generic/inet/hostname.c \
-        generic/inet/hostport.c \
-        generic/inet/tcp.c \
-        generic/inet/udp.c \
         generic/inet.c \
         generic/inetcfg.c \
         generic/inetping.c \
+        generic/inetping6.c \
         generic/io/asprintf.c \
         generic/io/input.c \
         generic/io/io.c \
-        generic/io/chardev.c \
-        generic/io/chardev_srv.c \
         generic/io/chargrid.c \
         generic/io/output.c \
@@ -115 +105 @@
         generic/io/log.c \
         generic/io/logctl.c \
-        generic/io/kio.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -127 +116 @@
         generic/iplink.c \
         generic/iplink_srv.c \
-        generic/irc.c \
-        generic/irq.c \
         generic/ieee_double.c \
         generic/power_of_ten.c \
@@ -139 +126 @@
         generic/loader.c \
         generic/getopt.c \
-        generic/adt/checksum.c \
         generic/adt/list.c \
         generic/adt/hash_table.c \
-        generic/adt/odict.c \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/char_map.c \
         generic/adt/prodcons.c \
         generic/time.c \
         generic/stdlib.c \
+        generic/mman.c \
         generic/udebug.c \
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
-        generic/rcu.c \
-        generic/setjmp.c \
+        generic/net/inet.c \
+        generic/net/socket_client.c \
+        generic/net/socket_parse.c \
         generic/stack.c \
         generic/stacktrace.c \
@@ -157 +146 @@
         generic/stats.c \
         generic/assert.c \
-        generic/pio_trace.c \
-        generic/uuid.c \
-        generic/vbd.c \
-        generic/vol.c
+        generic/pio_trace.c
 
 ifeq ($(CONFIG_RTLD),y)
@@ -174 +160 @@
         $(ARCH_SOURCES)
 
-TEST_SOURCES = \
-        test/main.c \
-        test/odict.c \
-        test/sprintf.c \
-        test/str.c
-
 include $(USPACE_PREFIX)/Makefile.common
 
-%.h: %.ag
-        $(AUTOGEN) probe $< >$<.probe.c
-        $(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
-        $(AUTOGEN) generate $< <$<.probe.s >$@   
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in