From e3e473dacce6cbb004fe94f0dba60955ac1018f2 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 5 Jul 2001 13:51:26 +0000 Subject: 2001-07-05 Ben Elliston * Make-common.in (srccgen): Remove. (CGEN_CPU_DIR): Define. (CGEN_READ_SCM): Redefine without $(srccgen). (CGEN_ARCH_SCM): Ditto. (CGEN_CPU_SCM): Ditto. (CGEN_DECODE_SCM): Ditto. (CGEN_DESC_SCM): Ditto. * $arch/Makefile.in: Use $(CGEN_CPU_DIR) where applicable. --- sim/i960/ChangeLog | 6 ++++++ sim/i960/Makefile.in | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'sim/i960') diff --git a/sim/i960/ChangeLog b/sim/i960/ChangeLog index 9b73dfa..8cd8512 100644 --- a/sim/i960/ChangeLog +++ b/sim/i960/ChangeLog @@ -1,3 +1,9 @@ +2001-07-05 Ben Elliston + + * Makefile.in (stamp-arch): Use $(CGEN_CPU_DIR). + (stamp-cpu): Likewise. + (stamp-desc): Likewise. + 2001-02-06 DJ Delorie * i960-desc.c: Update all the A macro definitions to the new diff --git a/sim/i960/Makefile.in b/sim/i960/Makefile.in index 0059e23..b1e0abe 100644 --- a/sim/i960/Makefile.in +++ b/sim/i960/Makefile.in @@ -105,20 +105,20 @@ CGEN_MAINT = ; @true # The following line is commented in or out depending upon --enable-cgen-maint. @CGEN_MAINT@CGEN_MAINT = -stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(srccgen)/i960.cpu +stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/i960.cpu $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \ FLAGS="with-scache with-profile=fn" touch stamp-arch arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch -stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(srccgen)/i960.cpu +stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/i960.cpu $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ cpu=i960base mach=i960:ka_sa,i960:ca SUFFIX= FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" touch stamp-cpu cpu.h sem.c sem-switch.c model.c decode.c decode.h: $(CGEN_MAINT) stamp-cpu stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) \ - $(srccgen)/sparc.cpu $(srccgen)/sparccom.cpu $(srccgen)/i960.cpu $(srccgen)/i960.cpu + $(CGEN_CPU_DIR)/sparc.cpu $(CGEN_CPU_DIR)/sparccom.cpu $(CGEN_CPU_DIR)/i960.cpu $(CGEN_CPU_DIR)/i960.cpu $(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) \ cpu=i960 mach=all touch stamp-desc -- cgit v1.1