Reorganize make files

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>

2 files changed, 28 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 8f87704..4390478 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,18 @@ LIBCFLAT_objdir = lib/libcflat
 LIBCFLAT_srcdir = lib/libcflat
 LIBCFLAT_archdir = lib/libcflat/$(ARCH)
 LIBCFLAT_archive = $(LIBCFLAT_objdir)/libcflat.a
-LIBCFLAT_OBJS = \
-	$(LIBCFLAT_objdir)/argv.o \
-	$(LIBCFLAT_objdir)/printf.o \
-	$(LIBCFLAT_objdir)/string.o \
-	$(LIBCFLAT_objdir)/report.o
+LIBCFLAT_OBJS = $(LIBCFLAT_objdir)/argv.o \
+	            $(LIBCFLAT_objdir)/printf.o \
+            	$(LIBCFLAT_objdir)/string.o \
+                $(LIBCFLAT_objdir)/devicetree.o \
+            	$(LIBCFLAT_objdir)/virtio.o \
+            	$(LIBCFLAT_objdir)/virtio-testdev.o \
+            	$(LIBCFLAT_objdir)/report.o \
+                $(LIBCFLAT_archdir)/io.o \
+            	$(LIBCFLAT_archdir)/misc.o \
+            	$(LIBCFLAT_archdir)/setup.o \
+            	$(LIBCFLAT_archdir)/spinlock.o \
+            	$(LIBCFLAT_archdir)/processor.o
 
 # libfdt paths
 LIBFDT_objdir = lib/libfdt
@@ -25,6 +32,13 @@ LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a
 LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES))
 LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
 
+libeabi = $(LIBCFLAT_archdir)/libeabi.a
+eabiobjs = $(LIBCFLAT_archdir)/eabi_compat.o
+libgcc := $(shell $(CC) -m$(ARCH) --print-libgcc-file-name)
+CFLAGS += -I$(ARCH) -DASM
+
+FLATLIBS = $(LIBCFLAT_archive) $(LIBFDT_archive) $(libgcc) $(libeabi)
+
 # cc-option
 # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
 
@@ -39,7 +53,7 @@ CFLAGS += -ffreestanding
 CFLAGS += -Wextra -Werror -Wall
 CFLAGS += -g -O0
 CFLAGS += -Ilib -I$(LIBFDT_srcdir) -I $(LIBCFLAT_srcdir) -I$(LIBCFLAT_archdir)
-CFLAGS += -Ilib -I/usr/arm-linux-gnueabi/include/
+#CFLAGS += -Ilib -I/usr/arm-linux-gnueabi/include/
 CFLAGS += -Iplatform/$(PLAT)
 CFLAGS += $(call cc-option, -fomit-frame-pointer, "")
 CFLAGS += $(call cc-option, -fno-stack-protector, "")
@@ -65,7 +79,13 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 
 -include */.*.d */*/.*.d
 
-clean: arch_clean
+$(libeabi): $(eabiobjs)
+	$(AR) rcs $@ $^
+
+libeabi_clean:
+	$(RM) $(libeabi) $(eabiobjs)
+
+clean: arch_clean libeabi_clean
 	$(RM) $(LIBCFLAT_archive) $(LIBCFLAT_OBJS) $(LIBCFLAT_objdir)/.*.d
 
 libfdt_clean:
diff --git a/arm/Makefile.tztest b/arm/Makefile.tztest
index fbedd7a..052e2fa 100644
--- a/arm/Makefile.tztest
+++ b/arm/Makefile.tztest
@@ -18,25 +18,11 @@ TZNSECOBJS		= $(ARCH)/nonsecure_init.o \
 			  	  $(ARCH)/tztest.o
 TZOBJS			= $(ARCH)/common_mmu.o \
                   $(ARCH)/common_svc.o
-LIBCFLAT_OBJS	+= $(LIBCFLAT_objdir)/devicetree.o \
-			  	   $(LIBCFLAT_objdir)/virtio.o \
-			  	   $(LIBCFLAT_objdir)/virtio-testdev.o \
-			  	   $(LIBCFLAT_archdir)/io.o \
-			  	   $(LIBCFLAT_archdir)/misc.o \
-			  	   $(LIBCFLAT_archdir)/setup.o \
-			  	   $(LIBCFLAT_archdir)/spinlock.o \
-			  	   $(LIBCFLAT_archdir)/processor.o
 
 all: $(TZTEST_IMAGE)
 
 ##################################################################
 
-libeabi = $(LIBCFLAT_archdir)/libeabi.a
-eabiobjs = $(LIBCFLAT_archdir)/eabi_compat.o
-libgcc := $(shell $(CC) -m$(ARCH) --print-libgcc-file-name)
-CFLAGS += -I$(ARCH) -DASM
-
-FLATLIBS = $(LIBCFLAT_archive) $(LIBFDT_archive) $(libgcc) $(libeabi)
 COMMON = $(FLATLIBS) $(TZOBJS)
 
 $(SECTEST): $(TZSECOBJS) $(COMMON) $(TZSECLOAD) $(TZNSECLOAD) $(TZBOOT)
@@ -68,15 +54,9 @@ $(TZNSECLOAD): $(ARCH)/tztest_nonsecure.lds.S Makefile platform/$(PLAT)/
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(libeabi): $(eabiobjs)
-	$(AR) rcs $@ $^
-
-arch_clean: libeabi_clean
+arch_clean:
 	$(RM) $(TZOBJS) $(TZSECOBJS) $(TZNSECOBJS) \
 		  $(TZSECLOAD) $(TZNSECLOAD) $(TZBOOT) \
 		  $(SECTEST) $(SECTESTIMAGE) $(NSECTEST) $(NSECTESTIMAGE) \
 		  $(TZTEST_IMAGE) \
 		  $(LIBCFLAT_OBJS) $(LIBCFLAT_archdir)/.*.d $(ARCH)/.*.d
-
-libeabi_clean:
-	$(RM) $(libeabi) $(eabiobjs)