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

Timestamp:

2010-05-21T07:50:04Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• uspace/lib/c/Makefile (moved) (moved from uspace/lib/libc/Makefile ) (7 diffs)

uspace/lib/c/Makefile

@@ -28 +28 @@
 #
 
--include ../../../Makefile.config
-
-USPACE_PREFIX = $(shell pwd)/../..
-#LIBS = $(LIBC_PREFIX)/libc.a
-LIBS =
-
-LINK = arch/$(UARCH)/_link.ld
-
-PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH)
-EXTRA_OUTPUT = $(LINK)
+USPACE_PREFIX = ../..
+ROOT_PATH = $(USPACE_PREFIX)/..
 
 INCLUDE_KERNEL = include/kernel
@@ -44 +35 @@
 INCLUDE_LIBARCH = include/libarch
 
-OUTPUT = libc.a
+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) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
+LIBRARY = libc
+
+-include $(COMMON_MAKEFILE)
+-include $(CONFIG_MAKEFILE)
+-include arch/$(UARCH)/Makefile.inc
 
 GENERIC_SOURCES = \
@@ -59 +63 @@
         generic/errno.c \
         generic/mem.c \
-        generic/string.c \
+        generic/str.c \
+        generic/str_error.c \
         generic/fibril.c \
         generic/fibril_synch.c \
@@ -77 +82 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/io/screenbuffer.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -92 +98 @@
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
-        generic/stacktrace.c
-
-ARCH_SOURCES = \
-        arch/$(UARCH)/src/entry.s \
-        arch/$(UARCH)/src/thread_entry.s
+        generic/stacktrace.c \
+        generic/arg_parse.c \
+        generic/stats.c
 
 SOURCES = \
@@ -102 +106 @@
         $(ARCH_SOURCES)
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
 
 $(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
@@ -115 +119 @@
         ln -sfn ../$< $@
 
-$(LINK): $(LINK).in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../$< $@