Make libcflat build local

1 files changed, 11 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index b1a687e..ed70160 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,9 @@ include config.mak
 
 .PHONY: arch_clean clean distclean
 
-# libcflat paths
-LIBCFLAT_objdir = libcflat
-LIBCFLAT_srcdir = libcflat
-LIBCFLAT_archdir = libcflat/$(ARCH)
-LIBCFLAT_archive = $(LIBCFLAT_objdir)/libcflat.a
-LIBCFLAT_OBJS = $(LIBCFLAT_objdir)/printf.o \
-            	$(LIBCFLAT_objdir)/string.o \
-                $(LIBCFLAT_archdir)/io.o \
-            	$(LIBCFLAT_archdir)/misc.o
-LIBEABI_OBJS = $(LIBCFLAT_archdir)/eabi_compat.o
-
-LIBEABI = $(LIBCFLAT_archdir)/libeabi.a
 libgcc := $(shell $(CC) -m$(ARCH) --print-libgcc-file-name)
-CFLAGS += -I$(ARCH) -DASM
 
-FLATLIBS = $(LIBCFLAT_archive) $(libgcc) $(LIBEABI)
+export FLATLIBS = libcflat/libcflat.a $(libgcc) libcflat/libeabi.a
 
 # cc-option
 # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
@@ -30,44 +17,29 @@ FLATLIBS = $(LIBCFLAT_archive) $(libgcc) $(LIBEABI)
 cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \
               > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
 
+CFLAGS += -I$(ARCH) -DASM
 CFLAGS += -m${ARCH} -mcpu=$(PROCESSOR)
 CFLAGS += $(autodepend-flags)
 CFLAGS += -std=gnu99
 CFLAGS += -ffreestanding
 CFLAGS += -Wextra -Werror -Wall
 CFLAGS += -g -O0
-CFLAGS += -Ilib -I $(LIBCFLAT_srcdir)/include -I$(LIBCFLAT_archdir)/include
+CFLAGS += -Ilib -Ilibcflat/include -Ilibcflat/$(ARCH)/include
 CFLAGS += -Iplatform/$(PLAT)
 CFLAGS += $(call cc-option, -fomit-frame-pointer, "")
 CFLAGS += $(call cc-option, -fno-stack-protector, "")
 CFLAGS += $(call cc-option, -fno-stack-protector-all, "")
-CXXFLAGS += $(CFLAGS)
-LDFLAGS += $(CFLAGS)
-
-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d
-
-#include architecure specific make rules
-include $(ARCH)/Makefile.tztest
-
-$(LIBCFLAT_archive): $(LIBCFLAT_OBJS)
-	$(AR) rcs $@ $^
-
-%.o: %.S
-	$(CC) $(CFLAGS) -c -nostdlib -o $@ $<
-
--include */.*.d */*/.*.d
 
-$(LIBEABI): $(LIBEABI_OBJS)
-	$(AR) rcs $@ $^
+export CFLAGS
 
-libeabi_clean:
-	$(RM) $(LIBEABI) $(LIBEABI_OBJS)
+#autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d
+#-include */.*.d */*/.*.d
 
-clean: arch_clean libeabi_clean
-	$(RM) $(LIBCFLAT_archive) $(LIBCFLAT_OBJS) $(LIBCFLAT_objdir)/.*.d
+all:
+	$(MAKE) -C libcflat all
 
-libcflat_clean:
-	$(RM) $(LIBCFLAT_archive) $(LIBCFLAT_OBJS)
+clean:
+	$(MAKE) -C libcflat clean
 
-distclean: clean libcflat_clean
+distclean: clean
 	$(RM) config.mak ..d cscope.*