Changeset f4f866c in mainline for uspace/lib/c/Makefile

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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

@@ -35 +35 @@
 INCLUDE_LIBARCH = include/libarch
 
-PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+COMMON_HEADER = $(ROOT_PATH)/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
+
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
+
+PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPT)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LINKER_SCRIPT)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
 LIBRARY = libc
-
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
 -include $(COMMON_MAKEFILE)
@@ -58 +61 @@
         generic/mem.c \
         generic/str.c \
+        generic/str_error.c \
         generic/fibril.c \
         generic/fibril_synch.c \
@@ -75 +79 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/io/screenbuffer.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -90 +95 @@
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
-        generic/stacktrace.c
+        generic/stacktrace.c \
+        generic/arg_parse.c \
+        generic/stats.c
 
 SOURCES = \
@@ -111 +118 @@
 $(LINKER_SCRIPT): $(LINKER_SCRIPT).in
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../$< $@