From 02ba6b2254446cc434f56b1e2bc6623220963a7d Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Fri, 6 Feb 2004 01:02:31 +0000 Subject: [PATCH] Makefile.in (srcextra): Add a level of indirection to ... 2004-02-05 Kelley Cook PR/13485 Makefile.in (srcextra): Add a level of indirection to ... (gcc.srcextra): ... here. (po-generated): Delete. (po/$(PACKAGE).pot: Use srcextra instead of po-generated. Depend on options.c. (start.encap): Remove superfluous lang.srcextra dependency. objc/Make-lang.in (po-generated): Delete. From-SVN: r77363 --- gcc/ChangeLog | 11 +++++++++++ gcc/Makefile.in | 14 ++++++-------- gcc/cp/ChangeLog | 4 ++++ gcc/cp/Make-lang.in | 2 -- gcc/java/ChangeLog | 4 ++++ gcc/java/Make-lang.in | 2 -- gcc/objc/Make-lang.in | 2 -- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 34562913ccb..5377d7ce56a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2004-02-05 Kelley Cook + + PR/13485 + Makefile.in (srcextra): Add a level of indirection to ... + (gcc.srcextra): ... here. + (po-generated): Delete. + (po/$(PACKAGE).pot: Use srcextra instead of po-generated. Depend on + options.c. + (start.encap): Remove superfluous lang.srcextra dependency. + objc/Make-lang.in (po-generated): Delete. + 2004-02-05 Kazu Hirata * config/ia64/ia64.c (REG_GP): Remove. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c70afb6a16d..430483cf13d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1061,7 +1061,7 @@ all.cross: native gcc-cross cpp$(exeext) specs \ $(LIBGCC) $(EXTRA_PARTS) lang.all.cross doc # This is what must be made before installing GCC and converting libraries. start.encap: native xgcc$(exeext) cpp$(exeext) specs \ - xlimits.h lang.start.encap @GENINSRC@ srcextra lang.srcextra + xlimits.h lang.start.encap @GENINSRC@ srcextra # These can't be made until after GCC can run. rest.encap: $(STMP_FIXPROTO) $(LIBGCC) $(EXTRA_PARTS) lang.rest.encap # This is what is made with the host's compiler @@ -1277,7 +1277,9 @@ c-parse.o : c-parse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(GGC_H) intl.h $(C_TREE_H) input.h flags.h toplev.h output.h $(CPPLIB_H) \ varray.h gt-c-parse.h langhooks.h -srcextra: c-parse.y c-parse.c gengtype-lex.c gengtype-yacc.c gengtype-yacc.h +srcextra: gcc.srcextra lang.srcextra + +gcc.srcextra: c-parse.y c-parse.c gengtype-lex.c gengtype-yacc.c gengtype-yacc.h -cp -p $^ $(srcdir) c-parse.c: c-parse.y @@ -2316,10 +2318,6 @@ intl.o: intl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h Makefile -DLOCALEDIR=\"$(localedir)\" \ -c $(srcdir)/intl.c $(OUTPUT_OPTION) -# Make-lang.in should add dependencies of po-generated on any generated -# files which need to be scanned by gettext (usually Yacc-generated parsers). -po-generated: c-parse.c options.c - # # Remake cpp and protoize. @@ -3858,8 +3856,8 @@ install-po: # fairly modern (POSIX-compliant) awk. # The .pot file is left in the build directory. $(PACKAGE).pot: po/$(PACKAGE).pot -po/$(PACKAGE).pot: force +po/$(PACKAGE).pot: force options.c -test -d po || mkdir po - $(MAKE) po-generated + $(MAKE) srcextra AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \ $(XGETTEXT) $(PACKAGE) $(srcdir) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4d028a3cac4..070192a7d27 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-02-05 Kelley Cook + + Make-lang.in (po-generated): Delete. + 2004-02-05 Kazu Hirata * call.c (type_passed_as): Replace PROMOTE_PROTOTYPES with diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 3723a9fac90..1d4d918be2d 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -58,8 +58,6 @@ g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) $(CON $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ $(INCLUDES) $(srcdir)/cp/g++spec.c) -po-generated: - # Create the compiler driver for g++. GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 714cd764196..23a2cdb176e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2004-02-05 Kelley Cook + + Make-lang.in (po-generated): Delete. + 2004-02-05 Kazu Hirata * Make-lang.in (java/decl.o, java/expr.o, java/parse.o): diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 356ac4b8225..c4e6866aaac 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -76,8 +76,6 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) -rm -f $(GCJ)-cross$(exeext) cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext) -po-generated: java/parse.c java/parse-scan.c - java.srcextra: java/parse.c java/parse-scan.c -cp -p $^ $(srcdir)/java diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 1b0665c97f8..2cfe073b917 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -73,8 +73,6 @@ objc/objc-act.o : objc/objc-act.c \ objc/objc-act.h input.h function.h output.h debug.h langhooks.h \ $(LANGHOOKS_DEF_H) gt-objc-objc-act.h gtype-objc.h -po-generated: objc/objc-parse.c - objc.srcextra: objc/objc-parse.c objc/objc-parse.y -cp -p $^ $(srcdir)/objc -- 2.30.2