Changeset 04803bf in mainline for uspace/lib/c/Makefile

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

uspace/lib/c/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2008 Jiri Svoboda
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +28 @@
 #
 
-## Common compiler flags
-#
+USPACE_PREFIX = ../..
+ROOT_PATH = $(USPACE_PREFIX)/..
 
-LIBC_PREFIX = $(shell pwd)
-SOFTINT_PREFIX = ../softint
+INCLUDE_KERNEL = include/kernel
+INCLUDE_ARCH = include/arch
+INCLUDE_LIBARCH = include/libarch
+INCLUDE_RTLDARCH = rtld/include/arch
 
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+COMMON_HEADER = $(ROOT_PATH)/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
 
-## Setup toolchain
-#
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-include $(LIBC_PREFIX)/Makefile.toolchain
+PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH)
+EXTRA_OUTPUT = $(LINKER_SCRIPT)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
+LIBRARY = libc
+
+-include $(COMMON_MAKEFILE)
+-include $(CONFIG_MAKEFILE)
+-include arch/$(UARCH)/Makefile.inc
 -include rtld/arch/$(UARCH)/Makefile.inc
 
-CFLAGS += -Irtld/include -I../../srv/loader/include -D__32_BITS__
-PIC_CFLAGS := $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
-
-## Sources
-#
+EXTRA_CFLAGS += -Irtld/include -I../../srv/loader/include
 
 GENERIC_SOURCES = \
@@ -52 +59 @@
         generic/as.c \
         generic/cap.c \
+        generic/clipboard.c \
         generic/devmap.c \
+        generic/devman.c \
+        generic/device/hw_res.c \
+        generic/device/char_dev.c \
+        generic/dlfcn.c \
         generic/event.c \
         generic/errno.c \
         generic/mem.c \
-        generic/string.c \
+        generic/str.c \
+        generic/str_error.c \
         generic/fibril.c \
-        generic/fibril_sync.c \
+        generic/fibril_synch.c \
         generic/pcb.c \
         generic/smc.c \
@@ -74 +87 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/io/screenbuffer.c \
+        generic/ipc/ns.c \
         generic/malloc.c \
         generic/sysinfo.c \
         generic/ipc.c \
         generic/async.c \
-        generic/dlfcn.c \
+        generic/async_sess.c \
         generic/loader.c \
         generic/getopt.c \
-        generic/adt/list.o \
-        generic/adt/hash_table.o \
+        generic/adt/list.c \
+        generic/adt/hash_table.c \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/measured_strings.c \
+        generic/adt/char_map.c \
         generic/time.c \
-        generic/err.c \
         generic/stdlib.c \
         generic/mman.c \
@@ -90 +107 @@
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
+        generic/net/inet.c \
+        generic/net/icmp_common.c \
+        generic/net/icmp_api.c \
+        generic/net/modules.c \
+        generic/net/packet.c \
+        generic/net/socket_client.c \
+        generic/net/socket_parse.c \
+        generic/stacktrace.c \
+        generic/arg_parse.c \
+        generic/sort.c \
+        generic/stats.c \
         rtld/rtld.c \
         rtld/elf_load.c \
@@ -96 +124 @@
         rtld/symbol.c
 
+SOURCES = \
+        $(GENERIC_SOURCES) \
+        $(ARCH_SOURCES)
 
-ARCH_SOURCES += \
-        arch/$(UARCH)/src/entry.s \
-        arch/$(UARCH)/src/thread_entry.s
+include $(USPACE_PREFIX)/Makefile.common
 
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
-ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
-OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
-PIC_OBJECTS := $(addsuffix .pio,$(basename $(OBJECTS)))
+$(INCLUDE_ARCH): $(INCLUDE_KERNEL) $(INCLUDE_KERNEL)/arch
+        ln -sfn kernel/arch $@
 
-OUTPUT := libc.a
+$(INCLUDE_LIBARCH): arch/$(UARCH)/include
+        ln -sfn ../$< $@
 
-ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
-        OUTPUT += libc.pic.a
-endif
+$(INCLUDE_RTLDARCH): rtld/arch/$(UARCH)/include
+        ln -sfn ../../$< $@
 
-.PHONY: all clean depend kerninc
+$(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)
 
-all: kerninc $(OUTPUT) arch/$(UARCH)/_link.ld
+$(INCLUDE_KERNEL): ../../../kernel/generic/include/
+        ln -sfn ../$< $@
 
-kerninc:
-        ln -sfn ../../../../kernel/generic/include include/kernel
-        ln -sfn kernel/arch include/arch
-        ln -sfn ../arch/$(UARCH)/include include/libarch
-        ln -sfn ../arch/$(UARCH)/include rtld/include/arch
+$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
 
--include Makefile.depend
-
-clean:
-        -rm -f include/kernel include/arch include/libarch rtld/include/arch libc.a libc.pic.a arch/$(UARCH)/_link.ld Makefile.depend
-        find . \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
-
-depend: kerninc
-        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
-        -makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
-
-libc.a: depend $(OBJECTS)
-        $(AR) rc $@ $(LIBS) $(OBJECTS)
-
-libc.pic.a: depend $(PIC_OBJECTS)
-        $(AR) rc $@ $(LIBS) $(PIC_OBJECTS)
-
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-%.pio: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.pio: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.pio: %.c
-        $(CC) $(DEFS) $(PIC_CFLAGS) -c $< -o $@
+$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
+        ln -sfn ../../../$< $@