2003-08-29 Dave Brolley <brolley@redhat.com>

        * Makefile.am (stamp-frv): Copy frv.cpu and frv.opc from
        $(srcdir)/../cpu temporarily when regenerating source files.
        * Makefile.in: Regenerated.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 077c4ed4ac34e07f7e61800eb9d269d14ec96a7b..927f764922469d188b6ae531c587d560231a671b 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-29  Dave Brolley  <brolley@redhat.com>
+
+       * Makefile.am (stamp-frv): Copy frv.cpu and frv.opc from
+       $(srcdir)/../cpu temporarily when regenerating source files.
+       * Makefile.in: Regenerated.
+
 2003-08-19  Nick Clifton  <nickc@redhat.com>
 
        * arm-dis.c (print_insn_arm: case 'A'): Add code to

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index ae03afc6d62599e8e4015ead6bc85e0480e5fb00..0bb7fd200450739346907aa114e431f538d6fa61 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -409,8 +409,14 @@ stamp-fr30: $(CGENDEPS) $(CPUDIR)/fr30.cpu $(CPUDIR)/fr30.opc
 
 $(srcdir)/frv-desc.h $(srcdir)/frv-desc.c $(srcdir)/frv-opc.h $(srcdir)/frv-opc.c $(srcdir)/frv-ibld.c $(srcdir)/frv-asm.c $(srcdir)/frv-dis.c: $(FRV_DEPS)
        @true
-stamp-frv: $(CGENDEPS) $(CPUDIR)/frv.cpu $(CPUDIR)/frv.opc
+# .cpu and .opc files for frv are kept in a different directory, but cgen has no switch to specify that location, so
+# copy those file to the regular place.
+stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/frv.cpu $(srcdir)/../cpu/frv.opc
+       cp -fp $(srcdir)/../cpu/frv.cpu $(CPUDIR)/frv.cpu
+       cp -fp $(srcdir)/../cpu/frv.opc $(CPUDIR)/frv.opc
        $(MAKE) run-cgen arch=frv prefix=frv options= extrafiles=
+       rm -f $(CPUDIR)/frv.cpu
+       rm -f $(CPUDIR)/frv.opc
 
 $(srcdir)/openrisc-desc.h $(srcdir)/openrisc-desc.c $(srcdir)/openrisc-opc.h $(srcdir)/openrisc-opc.c $(srcdir)/openrisc-ibld.c $(srcdir)/openrisc-asm.c $(srcdir)/openrisc-dis.c: $(OPENRISC_DEPS)
        @true

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 065293e290cc87bec42cb64fccece0d653b9e0cd..0c51eb1a779d59928dd6159a79af8a7a0629f232 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -467,7 +467,7 @@ acinclude.m4 aclocal.m4 config.in configure configure.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = libopcodes.a.c $(libopcodes_la_SOURCES)
 OBJECTS = libopcodes.a.$(OBJEXT) $(libopcodes_la_OBJECTS)
@@ -616,7 +616,7 @@ maintainer-clean-recursive:
        dot_seen=no; \
        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
          rev="$$subdir $$rev"; \
-         test "$$subdir" != "." || dot_seen=yes; \
+         test "$$subdir" = "." && dot_seen=yes; \
        done; \
        test "$$dot_seen" = "no" && rev=". $$rev"; \
        target=`echo $@ | sed s/-recursive//`; \
@@ -905,8 +905,14 @@ stamp-fr30: $(CGENDEPS) $(CPUDIR)/fr30.cpu $(CPUDIR)/fr30.opc
 
 $(srcdir)/frv-desc.h $(srcdir)/frv-desc.c $(srcdir)/frv-opc.h $(srcdir)/frv-opc.c $(srcdir)/frv-ibld.c $(srcdir)/frv-asm.c $(srcdir)/frv-dis.c: $(FRV_DEPS)
        @true
-stamp-frv: $(CGENDEPS) $(CPUDIR)/frv.cpu $(CPUDIR)/frv.opc
+# .cpu and .opc files for frv are kept in a different directory, but cgen has no switch to specify that location, so
+# copy those file to the regular place.
+stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/frv.cpu $(srcdir)/../cpu/frv.opc
+       cp -fp $(srcdir)/../cpu/frv.cpu $(CPUDIR)/frv.cpu
+       cp -fp $(srcdir)/../cpu/frv.opc $(CPUDIR)/frv.opc
        $(MAKE) run-cgen arch=frv prefix=frv options= extrafiles=
+       rm -f $(CPUDIR)/frv.cpu
+       rm -f $(CPUDIR)/frv.opc
 
 $(srcdir)/openrisc-desc.h $(srcdir)/openrisc-desc.c $(srcdir)/openrisc-opc.h $(srcdir)/openrisc-opc.c $(srcdir)/openrisc-ibld.c $(srcdir)/openrisc-asm.c $(srcdir)/openrisc-dis.c: $(OPENRISC_DEPS)
        @true