* Makefile.am (cpudir): Define.

	(cgen-m32r): Use src/cpu/m32r.cpu instead of src/cgen/cpu/m32r.cpu.
	* Makefile.in: Regenerate.

diff --git a/sid/component/cgen-cpu/m32r/ChangeLog b/sid/component/cgen-cpu/m32r/ChangeLog
index 869b826..18ecac3 100644 (file)
--- a/sid/component/cgen-cpu/m32r/ChangeLog
+++ b/sid/component/cgen-cpu/m32r/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-12  Doug Evans  <dje@sebabeach.org>
+
+       * Makefile.am (cpudir): Define.
+       (cgen-m32r): Use src/cpu/m32r.cpu instead of src/cgen/cpu/m32r.cpu.
+       * Makefile.in: Regenerate.
+
 2006-06-26  Dave Brolley  <brolley@redhat.com>
 
        * m32rbf.h (get_pc): New member of m32rbf_cpu.

diff --git a/sid/component/cgen-cpu/m32r/Makefile.am b/sid/component/cgen-cpu/m32r/Makefile.am
index 00ad2a1..3be284d 100644 (file)
--- a/sid/component/cgen-cpu/m32r/Makefile.am
+++ b/sid/component/cgen-cpu/m32r/Makefile.am
@@ -46,6 +46,7 @@ check-local: all
        (cd ../../testsuite ; $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS) $(DEJAGNUTESTS)" )
 
 cgendir = $(srcdir)/../../../../cgen
+cpudir = $(srcdir)/../../../../cpu
 CGENFLAGS = -v
 
 CGEN_ALL = cgen-m32r
@@ -55,7 +56,7 @@ cgen-all: $(CGEN_ALL)
 cgen-m32r:
        $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \
        m32r "with-scache" m32rbf m32r m32r m32rbf "m32r-" \
-       $(cgendir)/cpu/m32r.cpu \
+       $(cpudir)/m32r.cpu \
        "desc.h cpu.h decode.h decode.cxx semantics.cxx write.cxx defs.h"
 
 html_stylesheet=$(srcdir)/../../component_html.xsl

diff --git a/sid/component/cgen-cpu/m32r/Makefile.in b/sid/component/cgen-cpu/m32r/Makefile.in
index 2719e88..1b618d3 100644 (file)
--- a/sid/component/cgen-cpu/m32r/Makefile.in
+++ b/sid/component/cgen-cpu/m32r/Makefile.in
@@ -248,6 +248,7 @@ OPCODES_COMPILE_FLAGS = -DHAVE_CONFIG_H \
 
 DEJAGNUTESTS = m32rbsp.exp
 cgendir = $(srcdir)/../../../../cgen
+cpudir = $(srcdir)/../../../../cpu
 CGENFLAGS = -v
 CGEN_ALL = cgen-m32r
 html_stylesheet = $(srcdir)/../../component_html.xsl
@@ -658,7 +659,7 @@ cgen-all: $(CGEN_ALL)
 cgen-m32r:
        $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \
        m32r "with-scache" m32rbf m32r m32r m32rbf "m32r-" \
-       $(cgendir)/cpu/m32r.cpu \
+       $(cpudir)/m32r.cpu \
        "desc.h cpu.h decode.h decode.cxx semantics.cxx write.cxx defs.h"
 
 @HAVE_XSLTPROC_TRUE@@MAINTAINER_MODE_TRUE@.xml.html: