This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
remove gcc/move-if-change

From: Matt Kraai <kraai at ftbfs dot org>
To: gcc-patches at gcc dot gnu dot org
Date: Tue, 3 Feb 2004 08:18:48 -0800
Subject: remove gcc/move-if-change
Howdy,

The following patch changes all uses of move-if-change to use the
version at the top level, and removes the version in the gcc
subdirectory.

Bootstrapped and regression tested on powerpc-unknown-linux-gnu.

-- 
Matt Kraai            kraai@ftbfs.org            http://ftbfs.org/

(gcc/ChangeLog)

	* move-if-change: Remove.
	* Makefile.in: Use the top level move-if-change.

(gcc/ada/ChangeLog)

	* Make-lang.in: Use the top level move-if-change.

(gcc/f/ChangeLog)

	* Make-lang.in: Use the top level move-if-change.

(gcc/objc/ChangeLog)

	* Make-lang.in: Use the top level move-if-change.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1239
diff -u -r1.1239 Makefile.in
--- gcc/Makefile.in	31 Jan 2004 00:49:53 -0000	1.1239
+++ gcc/Makefile.in	2 Feb 2004 13:58:23 -0000
@@ -1202,7 +1202,7 @@
 	  $(SHELL) $(srcdir)/genmultilib '' '' '' '' '' '' '' no \
 	    > tmp-mlib.h; \
 	fi
-	$(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-mlib.h multilib.h
 	$(STAMP) s-mlib
 
 # Build multiple copies of libgcc.a, one for each target switch.
@@ -1284,7 +1284,7 @@
 	echo '/*WARNING: This file is automatically generated!*/' >tmp-c-parse.y
 	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
 	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" $< >>tmp-c-parse.y
-	$(SHELL) $(srcdir)/move-if-change tmp-c-parse.y $@
+	$(SHELL) $(srcdir)/../move-if-change tmp-c-parse.y $@
 
 c-incpath.o: c-incpath.c c-incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
 		intl.h prefix.h coretypes.h $(TM_H) cppdefault.h
@@ -1415,9 +1415,9 @@
 cppspec.o: cppspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
 
 tree-check.h: s-check ; @true
-s-check : gencheck$(build_exeext) $(srcdir)/move-if-change
+s-check : gencheck$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./gencheck$(build_exeext) > tmp-check.h
-	$(SHELL) $(srcdir)/move-if-change tmp-check.h tree-check.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-check.h tree-check.h
 	$(STAMP) s-check
 
 gencheck$(build_exeext) : gencheck.o $(BUILD_LIBDEPS)
@@ -1432,7 +1432,7 @@
 	ltf="$(lang_tree_files)"; for f in $$ltf; do \
 	    echo "#include \"$$f\""; \
 	done | sed 's|$(srcdir)/||' > tmp-gencheck.h
-	$(SHELL) $(srcdir)/move-if-change tmp-gencheck.h gencheck.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-gencheck.h gencheck.h
 	$(STAMP) s-gencheck
 
 specs.h : s-specs ; @true
@@ -1440,13 +1440,13 @@
 	lsf="$(lang_specs_files)"; for f in $$lsf; do \
 	    echo "#include \"$$f\""; \
 	done | sed 's|$(srcdir)/||' > tmp-specs.h
-	$(SHELL) $(srcdir)/move-if-change tmp-specs.h specs.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-specs.h specs.h
 	$(STAMP) s-specs
 
 options.c options.h: s-options ; @true
 s-options: $(lang_opt_files) $(srcdir)/opts.sh Makefile
 	AWK=$(AWK) $(SHELL) $(srcdir)/opts.sh \
-               '$(SHELL) $(srcdir)/move-if-change' \
+               '$(SHELL) $(srcdir)/../move-if-change' \
                options.c options.h $(lang_opt_files)
 	$(STAMP) s-options
 
@@ -1889,15 +1889,16 @@
 # trailing `;'), we call true for each.
 
 insn-config.h: s-config ; @true
-s-config : $(md_file) genconfig$(build_exeext) $(srcdir)/move-if-change
+s-config : $(md_file) genconfig$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genconfig$(build_exeext) $(md_file) > tmp-config.h
-	$(SHELL) $(srcdir)/move-if-change tmp-config.h insn-config.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-config.h insn-config.h
 	$(STAMP) s-config
 
 insn-conditions.c: s-conditions ; @true
-s-conditions : $(md_file) genconditions$(build_exeext) $(srcdir)/move-if-change
+s-conditions : $(md_file) genconditions$(build_exeext) \
+  $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genconditions$(build_exeext) $(md_file) > tmp-conditions.c
-	$(SHELL) $(srcdir)/move-if-change tmp-conditions.c insn-conditions.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-conditions.c insn-conditions.c
 	$(STAMP) s-conditions
 
 insn-conditions.o : insn-conditions.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
@@ -1910,21 +1911,22 @@
   coretypes.h $(GTM_H) gensupport.h
 
 insn-flags.h: s-flags ; @true
-s-flags : $(md_file) genflags$(build_exeext) $(srcdir)/move-if-change
+s-flags : $(md_file) genflags$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genflags$(build_exeext) $(md_file) > tmp-flags.h
-	$(SHELL) $(srcdir)/move-if-change tmp-flags.h insn-flags.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-flags.h insn-flags.h
 	$(STAMP) s-flags
 
 insn-codes.h: s-codes ; @true
-s-codes : $(md_file) gencodes$(build_exeext) $(srcdir)/move-if-change
+s-codes : $(md_file) gencodes$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./gencodes$(build_exeext) $(md_file) > tmp-codes.h
-	$(SHELL) $(srcdir)/move-if-change tmp-codes.h insn-codes.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-codes.h insn-codes.h
 	$(STAMP) s-codes
 
 insn-constants.h: s-constants ; @true
-s-constants : $(md_file) genconstants$(build_exeext) $(srcdir)/move-if-change
+s-constants : $(md_file) genconstants$(build_exeext) \
+  $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genconstants$(build_exeext) $(md_file) > tmp-constants.h
-	$(SHELL) $(srcdir)/move-if-change tmp-constants.h insn-constants.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-constants.h insn-constants.h
 	$(STAMP) s-constants
 
 insn-emit.o : insn-emit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1934,9 +1936,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-emit.c: s-emit ; @true
-s-emit : $(md_file) genemit$(build_exeext) $(srcdir)/move-if-change
+s-emit : $(md_file) genemit$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genemit$(build_exeext) $(md_file) > tmp-emit.c
-	$(SHELL) $(srcdir)/move-if-change tmp-emit.c insn-emit.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-emit.c insn-emit.c
 	$(STAMP) s-emit
 
 insn-recog.o : insn-recog.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1946,9 +1948,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-recog.c: s-recog ; @true
-s-recog : $(md_file) genrecog$(build_exeext) $(srcdir)/move-if-change
+s-recog : $(md_file) genrecog$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genrecog$(build_exeext) $(md_file) > tmp-recog.c
-	$(SHELL) $(srcdir)/move-if-change tmp-recog.c insn-recog.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-recog.c insn-recog.c
 	$(STAMP) s-recog
 
 insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1957,9 +1959,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-opinit.c: s-opinit ; @true
-s-opinit : $(md_file) genopinit$(build_exeext) $(srcdir)/move-if-change
+s-opinit : $(md_file) genopinit$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genopinit$(build_exeext) $(md_file) > tmp-opinit.c
-	$(SHELL) $(srcdir)/move-if-change tmp-opinit.c insn-opinit.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-opinit.c insn-opinit.c
 	$(STAMP) s-opinit
 
 insn-extract.o : insn-extract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1968,9 +1970,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-extract.c: s-extract ; @true
-s-extract : $(md_file) genextract$(build_exeext) $(srcdir)/move-if-change
+s-extract : $(md_file) genextract$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genextract$(build_exeext) $(md_file) > tmp-extract.c
-	$(SHELL) $(srcdir)/move-if-change tmp-extract.c insn-extract.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-extract.c insn-extract.c
 	$(STAMP) s-extract
 
 insn-peep.o : insn-peep.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1980,9 +1982,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-peep.c: s-peep ; @true
-s-peep : $(md_file) genpeep$(build_exeext) $(srcdir)/move-if-change
+s-peep : $(md_file) genpeep$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genpeep$(build_exeext) $(md_file) > tmp-peep.c
-	$(SHELL) $(srcdir)/move-if-change tmp-peep.c insn-peep.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-peep.c insn-peep.c
 	$(STAMP) s-peep
 
 insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -1992,15 +1994,15 @@
 	  $(OUTPUT_OPTION)
 
 insn-attr.h: s-attr ; @true
-s-attr : $(md_file) genattr$(build_exeext) $(srcdir)/move-if-change
+s-attr : $(md_file) genattr$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genattr$(build_exeext) $(md_file) > tmp-attr.h
-	$(SHELL) $(srcdir)/move-if-change tmp-attr.h insn-attr.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-attr.h insn-attr.h
 	$(STAMP) s-attr
 
 insn-attrtab.c: s-attrtab ; @true
-s-attrtab : $(md_file) genattrtab$(build_exeext) $(srcdir)/move-if-change
+s-attrtab : $(md_file) genattrtab$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genattrtab$(build_exeext) $(md_file) > tmp-attrtab.c
-	$(SHELL) $(srcdir)/move-if-change tmp-attrtab.c insn-attrtab.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-attrtab.c insn-attrtab.c
 	$(STAMP) s-attrtab
 
 insn-output.o : insn-output.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
@@ -2011,9 +2013,9 @@
 	  $(OUTPUT_OPTION)
 
 insn-output.c: s-output ; @true
-s-output : $(md_file) genoutput$(build_exeext) $(srcdir)/move-if-change
+s-output : $(md_file) genoutput$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genoutput$(build_exeext) $(md_file) > tmp-output.c
-	$(SHELL) $(srcdir)/move-if-change tmp-output.c insn-output.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-output.c insn-output.c
 	$(STAMP) s-output
 
 genrtl.o : genrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
@@ -2021,31 +2023,31 @@
 genrtl.c genrtl.h : s-genrtl
 	@true	# force gnu make to recheck modification times.
 
-s-genrtl: gengenrtl$(build_exeext) $(srcdir)/move-if-change
+s-genrtl: gengenrtl$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./gengenrtl$(build_exeext) -h > tmp-genrtl.h
-	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.h genrtl.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-genrtl.h genrtl.h
 	$(RUN_GEN) ./gengenrtl$(build_exeext) > tmp-genrtl.c
-	$(SHELL) $(srcdir)/move-if-change tmp-genrtl.c genrtl.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-genrtl.c genrtl.c
 	$(STAMP) s-genrtl
 
 insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 	       $(MACHMODE_H) real.h
 min-insn-modes.c insn-modes.c insn-modes.h : s-modes ; @true
 
-s-modes: genmodes$(build_exeext) $(srcdir)/move-if-change
+s-modes: genmodes$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genmodes$(build_exeext) -h > tmp-modes.h
-	$(SHELL) $(srcdir)/move-if-change tmp-modes.h insn-modes.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-modes.h insn-modes.h
 	$(RUN_GEN) ./genmodes$(build_exeext) -m > tmp-min-modes.c
-	$(SHELL) $(srcdir)/move-if-change tmp-min-modes.c min-insn-modes.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c
 	$(RUN_GEN) ./genmodes$(build_exeext) > tmp-modes.c
-	$(SHELL) $(srcdir)/move-if-change tmp-modes.c insn-modes.c
+	$(SHELL) $(srcdir)/../move-if-change tmp-modes.c insn-modes.c
 	$(STAMP) s-modes
 
 tm-preds.h: s-preds; @true
 
-s-preds: genpreds$(build_exeext) $(srcdir)/move-if-change
+s-preds: genpreds$(build_exeext) $(srcdir)/../move-if-change
 	$(RUN_GEN) ./genpreds$(build_exeext) > tmp-preds.h
-	$(SHELL) $(srcdir)/move-if-change tmp-preds.h tm-preds.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-preds.h tm-preds.h
 	$(STAMP) s-preds
 
 GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
@@ -2108,7 +2110,7 @@
 	for l in $$gf; do \
 	echo "\"$$l\", "; done >> tmp-gtyp.h
 	echo "NULL};" >> tmp-gtyp.h
-	$(SHELL) $(srcdir)/move-if-change tmp-gtyp.h gtyp-gen.h 
+	$(SHELL) $(srcdir)/../move-if-change tmp-gtyp.h gtyp-gen.h
 	$(STAMP) s-gtyp-gen
 
 s-gtype: gengtype$(build_exeext) $(GTFILES)
@@ -2440,9 +2442,9 @@
 gcov-iov$(build_exeext): gcov-iov.o
 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) gcov-iov.o -o $@
 gcov-iov.h: s-iov
-s-iov: gcov-iov$(build_exeext) $(srcdir)/move-if-change
+s-iov: gcov-iov$(build_exeext) $(srcdir)/../move-if-change
 	./gcov-iov$(build_exeext) > tmp-gcov-iov.h
-	$(SHELL) $(srcdir)/move-if-change tmp-gcov-iov.h gcov-iov.h
+	$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
 	$(STAMP) s-iov
 
 gcov.o: gcov.c gcov-io.h gcov-io.c gcov-iov.h intl.h $(SYSTEM_H) coretypes.h $(TM_H) $(CONFIG_H)
Index: gcc/move-if-change
===================================================================
RCS file: gcc/move-if-change
diff -N gcc/move-if-change
--- gcc/move-if-change	16 Dec 1998 20:57:26 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Like mv $1 $2, but if the files are the same, just delete $1.
-# Status is 0 if $2 is changed, 1 otherwise.
-if
-test -r $2
-then
-if
-cmp -s $1 $2
-then
-echo $2 is unchanged
-rm -f $1
-else
-mv -f $1 $2
-fi
-else
-mv -f $1 $2
-fi
Index: gcc/ada/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Make-lang.in,v
retrieving revision 1.73
diff -u -r1.73 Make-lang.in
--- gcc/ada/Make-lang.in	31 Jan 2004 00:50:00 -0000	1.73
+++ gcc/ada/Make-lang.in	2 Feb 2004 13:58:32 -0000
@@ -1081,7 +1081,7 @@
 	$(CP) $^ $(srcdir)/ada
 
 ada/sdefault.adb: ada/stamp-sdefault ; @true
-ada/stamp-sdefault : $(srcdir)/version.c $(srcdir)/move-if-change \
+ada/stamp-sdefault : $(srcdir)/version.c $(srcdir)/../move-if-change \
  Makefile
 	$(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb
 	$(ECHO) "with Osint; use Osint;" >>tmp-sdefault.adb
@@ -1108,7 +1108,7 @@
 	$(ECHO) "      return Relocate_Path (S0, S4);" >>tmp-sdefault.adb
 	$(ECHO) "   end Search_Dir_Prefix;" >>tmp-sdefault.adb
 	$(ECHO) "end Sdefault;" >> tmp-sdefault.adb
-	$(srcdir)/move-if-change tmp-sdefault.adb ada/sdefault.adb
+	$(srcdir)/../move-if-change tmp-sdefault.adb ada/sdefault.adb
 	touch ada/stamp-sdefault
 
 ada/sdefault.o : ada/sdefault.ads ada/sdefault.adb ada/types.ads \
Index: gcc/f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.142
diff -u -r1.142 Make-lang.in
--- gcc/f/Make-lang.in	31 Jan 2004 00:50:01 -0000	1.142
+++ gcc/f/Make-lang.in	2 Feb 2004 14:03:09 -0000
@@ -106,50 +106,50 @@
 f/str-1t.h f/str-1t.j: f/stamp-1t ; @true
 f/stamp-1t: f/fini$(build_exeext) f/str-1t.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-1t.fin f/tmp-str-1t.j f/tmp-str-1t.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-1t.j f/str-1t.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-1t.h f/str-1t.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-1t.j f/str-1t.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-1t.h f/str-1t.h
 	$(STAMP) f/stamp-1t
 
 f/str-2t.h f/str-2t.j: f/stamp-2t ; @true
 f/stamp-2t: f/fini$(build_exeext) f/str-2t.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-2t.fin f/tmp-str-2t.j f/tmp-str-2t.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-2t.j f/str-2t.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-2t.h f/str-2t.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-2t.j f/str-2t.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-2t.h f/str-2t.h
 	$(STAMP) f/stamp-2t
 
 f/str-fo.h f/str-fo.j: f/stamp-fo ; @true
 f/stamp-fo: f/fini$(build_exeext) f/str-fo.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-fo.fin f/tmp-str-fo.j f/tmp-str-fo.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-fo.j f/str-fo.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-fo.h f/str-fo.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-fo.j f/str-fo.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-fo.h f/str-fo.h
 	$(STAMP) f/stamp-fo
 
 f/str-io.h f/str-io.j: f/stamp-io ; @true
 f/stamp-io: f/fini$(build_exeext) f/str-io.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-io.fin f/tmp-str-io.j f/tmp-str-io.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-io.j f/str-io.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-io.h f/str-io.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-io.j f/str-io.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-io.h f/str-io.h
 	$(STAMP) f/stamp-io
 
 f/str-nq.h f/str-nq.j: f/stamp-nq ; @true
 f/stamp-nq: f/fini$(build_exeext) f/str-nq.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-nq.fin f/tmp-str-nq.j f/tmp-str-nq.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-nq.j f/str-nq.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-nq.h f/str-nq.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-nq.j f/str-nq.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-nq.h f/str-nq.h
 	$(STAMP) f/stamp-nq
 
 f/str-op.h f/str-op.j: f/stamp-op ; @true
 f/stamp-op: f/fini$(build_exeext) f/str-op.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-op.fin f/tmp-str-op.j f/tmp-str-op.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-op.j f/str-op.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-op.h f/str-op.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-op.j f/str-op.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-op.h f/str-op.h
 	$(STAMP) f/stamp-op
 
 f/str-ot.h f/str-ot.j: f/stamp-ot ; @true
 f/stamp-ot: f/fini$(build_exeext) f/str-ot.fin
 	./f/fini$(build_exeext) $(srcdir)/f/str-ot.fin f/tmp-str-ot.j f/tmp-str-ot.h
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-ot.j f/str-ot.j
-	$(SHELL) $(srcdir)/move-if-change f/tmp-str-ot.h f/str-ot.h
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-ot.j f/str-ot.j
+	$(SHELL) $(srcdir)/../move-if-change f/tmp-str-ot.h f/str-ot.h
 	$(STAMP) f/stamp-ot
 
 f/fini$(build_exeext): f/fini.o $(BUILD_LIBDEPS)
Index: gcc/objc/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/objc/Make-lang.in,v
retrieving revision 1.69
diff -u -r1.69 Make-lang.in
--- gcc/objc/Make-lang.in	21 Jan 2004 02:01:55 -0000	1.69
+++ gcc/objc/Make-lang.in	2 Feb 2004 14:03:12 -0000
@@ -84,7 +84,7 @@
 	echo '/*WARNING: This file is automatically generated!*/' >tmp-objc-prs.y
 	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
 	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" < $< >>tmp-objc-prs.y
-	$(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y $@
+	$(SHELL) $(srcdir)/../move-if-change tmp-objc-prs.y $@
 
 gtype-objc.h : s-gtype ; @true
 gt-objc-objc-act.h : s-gtype ; @true
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]