Changeset 4f5dc18 in mainline for uspace/lib/libc/Makefile

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• uspace/lib/libc/Makefile (modified) (1 diff)

uspace/lib/libc/Makefile

@@ -27 +27 @@
 #
 
-## Common compiler flags
-#
+include Makefile.common
 
-LIBC_PREFIX = $(shell pwd)
-SOFTINT_PREFIX = ../softint
+.PHONY: all clean
 
-
-## Setup toolchain
-#
-
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-
-## Sources
-#
-
-GENERIC_SOURCES = \
-        generic/libc.c \
-        generic/ddi.c \
-        generic/as.c \
-        generic/cap.c \
-        generic/devmap.c \
-        generic/event.c \
-        generic/errno.c \
-        generic/mem.c \
-        generic/string.c \
-        generic/fibril.c \
-        generic/fibril_sync.c \
-        generic/pcb.c \
-        generic/smc.c \
-        generic/thread.c \
-        generic/tls.c \
-        generic/task.c \
-        generic/futex.c \
-        generic/io/asprintf.c \
-        generic/io/io.c \
-        generic/io/printf.c \
-        generic/io/klog.c \
-        generic/io/snprintf.c \
-        generic/io/vprintf.c \
-        generic/io/vsnprintf.c \
-        generic/io/printf_core.c \
-        generic/io/console.c \
-        generic/malloc.c \
-        generic/sysinfo.c \
-        generic/ipc.c \
-        generic/async.c \
-        generic/loader.c \
-        generic/getopt.c \
-        generic/adt/list.o \
-        generic/adt/hash_table.o \
-        generic/time.c \
-        generic/err.c \
-        generic/stdlib.c \
-        generic/mman.c \
-        generic/udebug.c \
-        generic/vfs/vfs.c \
-        generic/vfs/canonify.c
-
-ARCH_SOURCES += \
-        arch/$(UARCH)/src/entry.s \
-        arch/$(UARCH)/src/thread_entry.s
-
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
-ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
-OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
-
-.PHONY: all clean depend kerninc
-
-all: kerninc libc.a arch/$(UARCH)/_link.ld
-
-kerninc:
-        ln -sfn ../../../../kernel/generic/include include/kernel
-        ln -sfn kernel/arch include/arch
-        ln -sfn ../arch/$(UARCH)/include include/libarch
-
--include Makefile.depend
+all: ../../../Makefile.config ../../../config.h ../../../config.defs
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build
 
 clean:
-        -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
-        find generic/ arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
-
-depend: kerninc
-        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
-
-libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-        $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_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 $@
+        rm -f $(DEPEND) $(DEPEND_PREV) $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LIBC) arch/*/_link.ld
+        find generic/ arch/*/ -name '*.o' -follow -exec rm \{\} \;