Changeset 15d0046 in mainline for uspace/lib/c/Makefile

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

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

uspace/lib/c/Makefile

@@ -50 +50 @@
 -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 = \
         generic/libc.c \
@@ -65 +72 @@
         generic/device/pio_window.c \
         generic/device/clock_dev.c \
+        generic/device/led_dev.c \
         generic/dhcp.c \
         generic/dnsr.c \
@@ -91 +99 @@
         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 \
@@ -108 +118 @@
         generic/iplink.c \
         generic/iplink_srv.c \
+        generic/irc.c \
+        generic/irq.c \
         generic/ieee_double.c \
         generic/power_of_ten.c \
@@ -159 +171 @@
 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
         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@