sim: standardize move-if-change rules

Use the srcroot path and make them all silent.

1 files changed, 29 insertions, 27 deletions

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index c230f29..4cc0916 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -25,6 +25,8 @@ srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
 srcsim = $(srcdir)/..
 
+include $(srcroot)/gdb/silent-rules.mk
+
 # Helper code from gnulib.
 GNULIB_PARENT_DIR = ../..
 include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
@@ -602,20 +604,20 @@ gentmap: $(srcdir)/../common/gentmap.c Makefile targ-vals.def
 targ-vals.def: $(srcdir)/../common/nltvals.def
 	rm -f targ-vals.def tmp-def
 	cat $(srcdir)/../common/nltvals.def > tmp-vals.def
-	$(SHELL) $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.def targ-vals.def
 
 targ-vals.h: stamp-vals ; @true
-stamp-vals: Makefile gentmap $(srcdir)/../../move-if-change
+stamp-vals: Makefile gentmap $(srcroot)/move-if-change
 	rm -f tmp-vals.h
 	./gentmap -h > tmp-vals.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.h targ-vals.h
 	@echo stamp > stamp-vals
 
 targ-map.c: stamp-map; @true
-stamp-map: Makefile gentmap $(srcdir)/../../move-if-change
+stamp-map: Makefile gentmap $(srcroot)/move-if-change
 	rm -f tmp-map.c
 	./gentmap -c > tmp-map.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-map.c targ-map.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-map.c targ-map.c
 	@echo stamp > stamp-map
 
 callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H)
@@ -633,23 +635,23 @@ options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H)
 defines.h: tmp-defines; @true
 tmp-defines: config.h Makefile
 	sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-defines.h defines.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-defines.h defines.h
 	touch tmp-defines
 
 #
 # Rules to create the built c source code files
 #
 
-tmp-dgen: dgen ppc-spr-table $(srcdir)/../../move-if-change
+tmp-dgen: dgen ppc-spr-table $(srcroot)/move-if-change
 	$(DGEN) $(DGEN_FLAGS) \
 		-r $(srcdir)/ppc-spr-table \
 		-n spreg.h -hp tmp-spreg.h \
 		-n spreg.c -p  tmp-spreg.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-spreg.h spreg.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-spreg.c spreg.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-spreg.h spreg.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-spreg.c spreg.c
 	touch tmp-dgen
 
-tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.igen $(IGEN_OPCODE_RULES) $(srcdir)/../../move-if-change tmp-ld-decode tmp-ld-cache tmp-ld-insn tmp-filter
+tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.igen $(IGEN_OPCODE_RULES) $(srcroot)/move-if-change tmp-ld-decode tmp-ld-cache tmp-ld-insn tmp-filter
 	$(IGEN) $(IGEN_FLAGS) \
 		-o $(srcdir)/$(IGEN_OPCODE_RULES) \
 		-I $(srcdir) -i $(srcdir)/ppc-instructions \
@@ -665,18 +667,18 @@ tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.
 		-n model.c     -m  tmp-model.c \
 		-n support.h   -hf tmp-support.h \
 		-n support.c   -f  tmp-support.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h icache.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c icache.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h idecode.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c idecode.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h semantics.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c semantics.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h model.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c model.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h support.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c support.c
 	touch tmp-igen
 
 # NOTE: Some versions of make don't handle files created as side-effects
@@ -755,7 +757,7 @@ misc.o: misc.c $(CONFIG_H) $(MISC_H)
 
 # real hardware
 hw.c hw.h: tmp-hw; @true
-tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change
+tmp-hw: Makefile $(HW_SRC) $(srcroot)/move-if-change
 	# The first for loop is to remove duplicates.
 	f=""; \
 	for i in $(HW_SRC) ; do \
@@ -781,8 +783,8 @@ tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change
 		-e 's/^/    /' \
 		-e 's/$$/_device_descriptor,/' \
 		> tmp-hw.c
-	$(SHELL) $(srcdir)/../../move-if-change tmp-hw.h hw.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-hw.c hw.c
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-hw.h hw.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-hw.c hw.c
 	touch tmp-hw
 
 hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H) $(HW_CPU_H) $(INTERRUPTS_H) $(CPU_H)
@@ -811,7 +813,7 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H)
 
 # real packages
 pk.h: tmp-pk; @true
-tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change
+tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change
 	# The first for loop is to remove duplicates.
 	f=""; \
 	for i in $(PACKAGE_SRC) ; do \
@@ -825,7 +827,7 @@ tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change
 		-e 's/^/extern package_create_instance_callback pk_/' \
 		-e 's/$$/_create_instance;/' \
 		> tmp-pk.h
-	$(SHELL) $(srcdir)/../../move-if-change tmp-pk.h pk.h
+	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-pk.h pk.h
 	touch tmp-pk
 
 pk_disklabel.o: pk_disklabel.c $(DEVICE_TABLE_H) $(PK_H)