* configure.in: Add support for --enable-cgen-maint.

	* Makefile.am (M32R_DEPS): New variable.
	(m32r-opc.h,m32r-opc.c,m32r-asm.c,m32r-dis.c): Update dependencies.
	* aclocal.m4: Regenerate.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

	* Makefile.am (CGENFILES): Add minsn.scm.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 9fc3417ffa86cb2c63e14876a336dda037c02793..5c0b3b089e4fc690c90ec1de9d056e1d08a64eed 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,8 +1,23 @@
+start-sanitize-cygnus
+Fri May  1 13:47:42 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+       * configure.in: Add support for --enable-cgen-maint.
+       * Makefile.am (M32R_DEPS): New variable.
+       (m32r-opc.h,m32r-opc.c,m32r-asm.c,m32r-dis.c): Update dependencies.
+       * aclocal.m4: Regenerate.
+       * Makefile.in: Regenerate.
+       * configure: Regenerate.
+
+       * Makefile.am (CGENFILES): Add minsn.scm.
+
+end-sanitize-cygnus
 Tue Apr 28 14:12:12 1998  Nick Clifton  <nickc@cygnus.com>
 
        * cgen-asm.c: Internationalised.
+start-sanitize-cygnus
        * cgen-asm.in: Internationalised.
        * cgen-opc.in: Internationalised.
+end-sanitize-cygnus
        * m32r-asm.c: Internationalised.
        * m32r-dis.c: Internationalised.
        * m32r-opc.c: Internationalised.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 230f99d8ed93e93c5e2361e6fcc4106e5bbd61cd..88d1a28331f4cefb6272ead42bfac60ccb862a5e 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -172,9 +172,16 @@ CGENFILES = $(CGENDIR)/object.scm $(CGENDIR)/utils.scm \
        $(CGENDIR)/mode.scm $(CGENDIR)/mach.scm \
        $(CGENDIR)/model.scm $(CGENDIR)/hardware.scm \
        $(CGENDIR)/ifield.scm $(CGENDIR)/iformat.scm \
-       $(CGENDIR)/operand.scm $(CGENDIR)/insn.scm \
+       $(CGENDIR)/operand.scm $(CGENDIR)/insn.scm $(CGENDIR)/minsn.scm \
        $(CGENDIR)/opcodes.scm $(CGENDIR)/cdl-c.scm \
        $(CGENDIR)/cgen-opc.scm cgen-opc.in cgen-asm.in cgen-dis.in
+# The CGEN_MAINT conditional is put here so it end up in Makefile.in
+# properly sanitized.
+if CGEN_MAINT
+M32R_DEPS = stamp-m32r
+else
+M32R_DEPS =
+endif
 # The end marker is written this way to pass through automake unscathed.
 ENDSAN = end-sanitize-cygnus
 
@@ -185,9 +192,8 @@ cgen:
 
 .PHONY: cgen
 
-# For now, require developers to configure with --enable-maintainer-mode.
-# ??? Do we need to use a different option?
-m32r-opc.h m32r-opc.c m32r-asm.c m32r-dis.c: @MAINT@ stamp-m32r
+# For now, require developers to configure with --enable-cgen-maint.
+m32r-opc.h m32r-opc.c m32r-asm.c m32r-dis.c: $(M32R_DEPS)
        @true
 stamp-m32r: $(CGENFILES) $(CGENDIR)/m32r.cpu $(CGENDIR)/m32r.opc
        $(MAKE) cgen arch=m32r prefix=m32r

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index bc60939f13b4c6f56f764a0b35ee1c1aea7ce909..988611ad2cc259cae8a3ca616dd08f4b4f04e1ce 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -233,9 +233,13 @@ CGENFILES = $(CGENDIR)/object.scm $(CGENDIR)/utils.scm \
        $(CGENDIR)/mode.scm $(CGENDIR)/mach.scm \
        $(CGENDIR)/model.scm $(CGENDIR)/hardware.scm \
        $(CGENDIR)/ifield.scm $(CGENDIR)/iformat.scm \
-       $(CGENDIR)/operand.scm $(CGENDIR)/insn.scm \
+       $(CGENDIR)/operand.scm $(CGENDIR)/insn.scm $(CGENDIR)/minsn.scm \
        $(CGENDIR)/opcodes.scm $(CGENDIR)/cdl-c.scm \
        $(CGENDIR)/cgen-opc.scm cgen-opc.in cgen-asm.in cgen-dis.in
+# The CGEN_MAINT conditional is put here so it end up in Makefile.in
+# properly sanitized.
+@CGEN_MAINT_TRUE@M32R_DEPS = stamp-m32r
+@CGEN_MAINT_FALSE@M32R_DEPS =
 # The end marker is written this way to pass through automake unscathed.
 ENDSAN = end-sanitize-cygnus
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -624,9 +628,8 @@ cgen:
 
 .PHONY: cgen
 
-# For now, require developers to configure with --enable-maintainer-mode.
-# ??? Do we need to use a different option?
-m32r-opc.h m32r-opc.c m32r-asm.c m32r-dis.c: @MAINT@ stamp-m32r
+# For now, require developers to configure with --enable-cgen-maint.
+m32r-opc.h m32r-opc.c m32r-asm.c m32r-dis.c: $(M32R_DEPS)
        @true
 stamp-m32r: $(CGENFILES) $(CGENDIR)/m32r.cpu $(CGENDIR)/m32r.opc
        $(MAKE) cgen arch=m32r prefix=m32r