Patchwork tests/tcg/xtensa: Fix out-of-tree build

login
register
mail settings
Submitter Andreas Färber
Date July 6, 2013, 6:41 p.m.
Message ID <1373136097-14465-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/257296/
State New
Headers show

Comments

Andreas Färber - July 6, 2013, 6:41 p.m.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 configure                 | 5 +++--
 tests/tcg/xtensa/Makefile | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

Patch

diff --git a/configure b/configure
index 0e0adde..7b60efd 100755
--- a/configure
+++ b/configure
@@ -4469,13 +4469,14 @@  if [ "$dtc_internal" = "yes" ]; then
 fi
 
 # build tree in object directory in case the source is not in the current directory
-DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos"
+DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa"
+DIRS="$DIRS tests/libqos"
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS qapi-generated"
 FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
 FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
-FILES="$FILES tests/tcg/lm32/Makefile po/Makefile"
+FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES pc-bios/spapr-rtas/Makefile"
 FILES="$FILES pc-bios/s390-ccw/Makefile"
diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile
index 002fd87..c77ff76 100644
--- a/tests/tcg/xtensa/Makefile
+++ b/tests/tcg/xtensa/Makefile
@@ -1,4 +1,4 @@ 
--include ../../config-host.mak
+-include ../../../config-host.mak
 
 CROSS=xtensa-dc232b-elf-
 
@@ -52,13 +52,13 @@  TESTCASES += test_windowed.tst
 
 all: build
 
-%.o: $(SRC_PATH)/tests/xtensa/%.c
+%.o: $(SRC_PATH)/tests/tcg/xtensa/%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-%.o: $(SRC_PATH)/tests/xtensa/%.S
+%.o: $(SRC_PATH)/tests/tcg/xtensa/%.S
 	$(AS) $(ASFLAGS) -c $< -o $@
 
-%.tst: %.o macros.inc $(CRT) Makefile
+%.tst: %.o $(SRC_PATH)/tests/tcg/xtensa/macros.inc $(CRT) Makefile
 	$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@
 
 build: $(TESTCASES)