Changeset 8e7c9fe in mainline for uspace/lib/c/Makefile

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-COMMON_HEADER = $(ROOT_PATH)/common.h
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
-
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
 LINKER_SCRIPTS = \
@@ -50 +47 @@
 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 = \
@@ -70 +72 @@
         generic/device/pio_window.c \
         generic/device/clock_dev.c \
+        generic/device/led_dev.c \
         generic/dhcp.c \
         generic/dnsr.c \
@@ -96 +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 \
@@ -113 +118 @@
         generic/iplink.c \
         generic/iplink_srv.c \
+        generic/irc.c \
+        generic/irq.c \
         generic/ieee_double.c \
         generic/power_of_ten.c \
@@ -131 +138 @@
         generic/time.c \
         generic/stdlib.c \
-        generic/mman.c \
         generic/udebug.c \
         generic/vfs/vfs.c \
@@ -161 +167 @@
 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