move-if-change: Remove.

	* move-if-change: Remove.
	* Makefile.in (s-mlib, c-parse.y, s-check, s-gencheck)
	(s-specs, s-options, s-config, s-conditions, s-flags, s-codes)
	(s-constants, s-emit, s-recog, s-opinit, s-extract, s-peep)
	(s-attr, s-attrtab, s-output, s-genrtl, s-modes, s-preds)
	(s-gtyp-gen, s-iov): Use the top level move-if-change.
	* objc/Make-lang.in (objc/objc-parse.y): Likewise.

(gcc/ada/ChangeLog)

	* Make-lang.in (ada/stamp-sdefault): Use the top level
	move-if-change.

(gcc/f/ChangeLog)

	* Make-lang.in (f/stamp-1t, f/stamp-2t, f/stamp-fo)
	(f/stamp-io, f/stamp-nq, f/stamp-op, f/stamp-ot): Use the top
	level move-if-change.

From-SVN: r78146

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 79022e8218061e5bba2b8a481b0ee93b9499713f..ce6b42892a19e631c4ab6c75fe0d9fa746810bbb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-19  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * move-if-change: Remove.
+       * Makefile.in (s-mlib, c-parse.y, s-check, s-gencheck)
+       (s-specs, s-options, s-config, s-conditions, s-flags, s-codes)
+       (s-constants, s-emit, s-recog, s-opinit, s-extract, s-peep)
+       (s-attr, s-attrtab, s-output, s-genrtl, s-modes, s-preds)
+       (s-gtyp-gen, s-iov): Use the top level move-if-change.
+       * objc/Make-lang.in (objc/objc-parse.y): Likewise.
+
 2004-02-19  James E Wilson  <wilson@specifixinc.com>
 
        * config/i386/i386.md (doloop_end_internal): Use nonimmediate_operand

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3f65e604d4cb4ba0000e7d29511836c9ddaa5bd9..0c1b23cb8b5b8a2fe1718c64cde7354d869699ff 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1210,7 +1210,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
          $(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.
@@ -1294,7 +1294,7 @@ c-parse.y: c-parse.in
        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
@@ -1428,7 +1428,7 @@ 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)
        $(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)
@@ -1443,7 +1443,7 @@ s-gencheck : Makefile
        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
@@ -1451,13 +1451,13 @@ s-specs : Makefile
        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
 
@@ -1907,13 +1907,13 @@ libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
 insn-config.h: s-config ; @true
 s-config : $(md_file) genconfig$(build_exeext)
        $(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)
        $(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 \
@@ -1928,19 +1928,19 @@ dummy-conditions.o : dummy-conditions.c $(BCONFIG_H) $(SYSTEM_H) \
 insn-flags.h: s-flags ; @true
 s-flags : $(md_file) genflags$(build_exeext)
        $(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)
        $(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)
        $(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) \
@@ -1952,7 +1952,7 @@ insn-emit.o : insn-emit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-emit.c: s-emit ; @true
 s-emit : $(md_file) genemit$(build_exeext)
        $(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) \
@@ -1964,7 +1964,7 @@ insn-recog.o : insn-recog.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-recog.c: s-recog ; @true
 s-recog : $(md_file) genrecog$(build_exeext)
        $(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) \
@@ -1975,7 +1975,7 @@ insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-opinit.c: s-opinit ; @true
 s-opinit : $(md_file) genopinit$(build_exeext)
        $(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) \
@@ -1986,7 +1986,7 @@ insn-extract.o : insn-extract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-extract.c: s-extract ; @true
 s-extract : $(md_file) genextract$(build_exeext)
        $(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) \
@@ -1998,7 +1998,7 @@ insn-peep.o : insn-peep.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-peep.c: s-peep ; @true
 s-peep : $(md_file) genpeep$(build_exeext)
        $(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) \
@@ -2010,13 +2010,13 @@ insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-attr.h: s-attr ; @true
 s-attr : $(md_file) genattr$(build_exeext)
        $(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)
        $(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) \
@@ -2029,7 +2029,7 @@ insn-output.o : insn-output.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 insn-output.c: s-output ; @true
 s-output : $(md_file) genoutput$(build_exeext)
        $(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) \
@@ -2039,9 +2039,9 @@ genrtl.c genrtl.h : s-genrtl
 
 s-genrtl: gengenrtl$(build_exeext)
        $(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) \
@@ -2050,18 +2050,18 @@ min-insn-modes.c insn-modes.c insn-modes.h : s-modes ; @true
 
 s-modes: genmodes$(build_exeext)
        $(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)
        $(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 \
@@ -2124,7 +2124,7 @@ s-gtyp-gen: Makefile
        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)
@@ -2454,7 +2454,7 @@ gcov-iov$(build_exeext): gcov-iov.o
 gcov-iov.h: s-iov
 s-iov: gcov-iov$(build_exeext)
        ./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)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 59bed8f0c8cf03805df2cce61431bccd644f918d..28a8259a0338404a576e3a0d495fede783e7a7e0 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * Make-lang.in (ada/stamp-sdefault): Use the top level
+       move-if-change.
+
 2004-02-19  Richard Henderson  <rth@redhat.com>
 
        * misc.c (record_code_position): Add third build arg for RTL_EXPR.

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 188bd5a003b8d2256e7e1db2844d6ddf49efafa3..69cc77b8bfb337553d440f4e8f78e04bca430c60 100644 (file)
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -1107,7 +1107,7 @@ ada/stamp-sdefault : $(srcdir)/version.c Makefile
        $(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 \

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index e0471707eee4eab21a89e6cd0a97a5ba95989a69..0dd169a080ebdd7cd3c9320590774c99dd123d2a 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-19  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * Make-lang.in (f/stamp-1t, f/stamp-2t, f/stamp-fo)
+       (f/stamp-io, f/stamp-nq, f/stamp-op, f/stamp-ot): Use the top
+       level move-if-change.
+
 2004-02-15  Roger Sayle  <roger@eyesopen.com>
 
        * lex.c (ffelex_get_directive_line): Provide a more descriptive

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 9c35cd497e796f74da47d12ccb589803f50ee2ee..5131a577a929f2c78fed803f0dd2b91ce330b8ce 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -1,5 +1,6 @@
 # Top level -*- makefile -*- fragment for GNU Fortran.
-#   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 
 #This file is part of GNU Fortran.
 
@@ -106,50 +107,50 @@ f/stamp-str: f/str-1t.h f/str-1t.j f/str-2t.h f/str-2t.j \
 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)

diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 2cfe073b9173ccaf36ef27acaf6a821c74a72aaf..12a20569c67761ec2ee5b009646b82ed2804df51 100644 (file)
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -1,5 +1,5 @@
 # Top level -*- makefile -*- fragment for GNU Objective-C
-#   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003
+#   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -83,7 +83,7 @@ objc/objc-parse.y: c-parse.in
        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