[kvm-unit-tests PATCH 2/2] powerpc/ppc64: Makefile cleanup

Andrew Jones
2016-05-09T14:01:16Z

This does the same cleanup as 'x86: Makefile refine'

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
powerpc/Makefile.common | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index 4449aec616853..60d545c98e38c 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -22,6 +22,9 @@ CFLAGS += -I lib -I lib/libfdt
CFLAGS += -Wa,-mregnames
CFLAGS += -fpie

+# We want to keep intermediate files: %.elf and %.o
+.PRECIOUS: %.elf %.o
+
asm-offsets = lib/$(ARCH)/asm-offsets.h
include scripts/asm-offsets.mak

@@ -37,7 +40,7 @@ cflatobjs += lib/powerpc/processor.o
FLATLIBS = $(libcflat) $(LIBFDT_archive)
%.elf: CFLAGS += $(arch_CFLAGS)
%.elf: LDFLAGS = $(arch_LDFLAGS) -nostdlib -pie
-%.elf: %.o $(FLATLIBS) powerpc/flat.lds
+%.elf: %.o $(FLATLIBS) powerpc/flat.lds $(cstart.o) $(reloc.o)
$(LD) $(LDFLAGS) -o $@ \
-T powerpc/flat.lds --build-id=none \
$(filter %.o, $^) $(FLATLIBS)
@@ -69,11 +72,3 @@ generated_files = $(asm-offsets)
test_cases: $(generated_files) $(tests-common) $(tests)

$(cstart.o): $(asm-offsets)
-
-$(TEST_DIR)/selftest.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/selftest.o
-
-$(TEST_DIR)/spapr_hcall.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/spapr_hcall.o
-
-$(TEST_DIR)/rtas.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/rtas.o
-
-$(TEST_DIR)/emulator.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/emulator.o
--
2.4.11