Changes in uspace/lib/libc/Makefile [cc1f8d4:e035612] in mainline

File:

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

uspace/lib/libc/Makefile

@@ -27 +27 @@
 #
 
-include Makefile.common
+## Common compiler flags
+#
 
-.PHONY: all clean
+LIBC_PREFIX = $(shell pwd)
+SOFTINT_PREFIX = ../softint
 
-all: ../../../Makefile.config ../../../config.h ../../../config.defs
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+
+## 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: libc.a
+
+-include Makefile.depend
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(LIBC) arch/*/_link.ld
-        find generic/ arch/*/ -name '*.o' -follow -exec rm \{\} \;
+        -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 arch/$(UARCH)/_link.ld
+        -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)
+
+kerninc:
+        ln -sfn ../../../../kernel/generic/include include/kernel
+        ln -sfn kernel/arch include/arch
+        ln -sfn ../arch/$(UARCH)/include include/libarch
+
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+        $(GCC) $(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 $@