From 53979244b1e112c815f043ff32bea6a3d21e7a99 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Mon, 19 Oct 2009 19:59:02 -0700
Subject: [PATCH] Improve Makefile rules for XScale debug handler; fixes 'make
 distcheck'.

---
 src/target/Makefile.am | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index bdef58c24d..f62ba1d878 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -11,9 +11,15 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/xsvf
 
 BIN2C		= $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
-DEBUG_HANDLER	= $(top_srcdir)/src/target/xscale/debug_handler.bin
 
-xscale_debug.h: $(BIN2C) $(DEBUG_HANDLER)
+DEBUG_HANDLER	= $(srcdir)/xscale/debug_handler.bin
+EXTRA_DIST = $(DEBUG_HANDLER)
+
+DEBUG_HEADER	= xscale_debug.h
+BUILT_SOURCES = $(DEBUG_HEADER)
+CLEANFILES = $(DEBUG_HEADER)
+
+$(DEBUG_HEADER): $(BIN2C) $(DEBUG_HANDLER)
 	$(BIN2C) < $(DEBUG_HANDLER) xscale_debug_handler > xscale_debug.h
 
 METASOURCES = AUTO
@@ -61,9 +67,6 @@ libtarget_la_SOURCES = \
 	mips_ejtag.c \
 	avrt.c
 
-BUILT_SOURCES = \
-	xscale_debug.h
-
 noinst_HEADERS = \
 	target.h \
 	target_type.h \
-- 
2.30.2