diff options
| author | Tom Tromey <tromey@redhat.com> | 2008-03-27 19:20:18 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2008-03-27 19:20:18 +0000 |
| commit | e980df8e7fd4d13a811de800c7565ac6f43994a4 (patch) | |
| tree | dca8bf9f49634b67bd002709d7bfef4b2af1a54e /gcc/objcp | |
| parent | 2bc894d9cff5cee4ae01ed30bae16f179329bc61 (diff) | |
| download | gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.zip gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.tar.gz gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.tar.bz2 | |
sourcebuild.texi, [...]: Revert automatic dependency patch.
gcc/
* doc/sourcebuild.texi, doc/install.texi, configure, aclocal.m4,
configure.ac, Makefile.in, config/t-darwin, config/m32c/t-m32c,
config/spu/t-spu-elf, config/i386/t-interix,
config/i386/t-cygming, config/i386/x-i386, config/i386/t-cygwin,
config/i386/x-darwin, config/i386/x-mingw32,
config/i386/t-netware, config/i386/x-cygwin, config/i386/t-nwld,
config/sh/t-sh, config/sh/t-symbian, config/x-linux,
config/t-sol2, config/x-hpux, config/x-darwin, config/ia64/t-ia64,
config/x-solaris, config/t-vxworks, config/m68k/t-uclinux,
config/rs6000/x-rs6000, config/rs6000/x-darwin64,
config/rs6000/x-darwin, config/rs6000/t-rs6000,
config/score/t-score-elf, config/arm/t-strongarm-pe,
config/arm/t-pe, config/arm/t-arm, config/arm/t-wince-pe,
config/v850/t-v850, config/v850/t-v850e, config/bfin/t-bfin-linux:
Revert automatic dependency patch.
gcc/java/
* Make-lang.in: Revert automatic dependency patch.
gcc/objc/
* Make-lang.in: Revert automatic dependency patch.
gcc/objcp/
* Make-lang.in: Revert automatic dependency patch.
gcc/cp/
* Make-lang.in: Revert automatic dependency patch.
gcc/fortran/
* Make-lang.in: Revert automatic dependency patch.
From-SVN: r133652
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/objcp/Make-lang.in | 30 |
2 files changed, 28 insertions, 6 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index cdc6144..4a5cb75 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,7 @@ +2008-03-27 Tom Tromey <tromey@redhat.com> + + * Make-lang.in: Revert automatic dependency patch. + 2008-03-25 Tom Tromey <tromey@redhat.com> * Make-lang.in (obj-c++_OBJS): Rename from objcp_OBJS. diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index 77e1451..97b79c2 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -1,5 +1,5 @@ # Top level -*- makefile -*- fragment for GNU Objective-C++ -# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2005, 2007 Free Software Foundation, Inc. # Contributed by Ziemowit Laski <zlaski@apple.com> #This file is part of GCC. @@ -51,8 +51,6 @@ objcp-warn = $(STRICT_WARN) -DOBJCPLUS -I$(srcdir)/objc -I$(srcdir)/cp OBJCXX_OBJS = objcp/objcp-act.o objcp/objcp-lang.o objcp/objcp-decl.o \ $(CXX_AND_OBJCXX_OBJS) -obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o - cc1objplus-dummy$(exeext): $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) \ $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ @@ -61,13 +59,33 @@ cc1objplus-dummy$(exeext): $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) \ cc1objplus-checksum.c : cc1objplus-dummy$(exeext) build/genchecksum$(build_exeext) build/genchecksum$(build_exeext) cc1objplus-dummy$(exeext) > $@ +cc1objplus-checksum.o : cc1objplus-checksum.c + cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS) -# Note that the source file is in a different directory. -objcp/objcp-act.o: objc/objc-act.c - $(COMPILE) $< +# Objective C++ language specific files. + +objcp/objcp-lang.o : objcp/objcp-lang.c \ + $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h objc/objc-act.h \ + $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-objcp.h \ + $(DIAGNOSTIC_H) cp/cp-objcp-common.h $(TREE_GIMPLE_H) + +objcp/objcp-decl.o : objcp/objcp-decl.c \ + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ + toplev.h $(GGC_H) $(C_PRAGMA_H) input.h $(FLAGS_H) output.h \ + objc/objc-act.h objcp/objcp-decl.h $(TREE_GIMPLE_H) $(EXPR_H) $(TARGET_H) + +# The following must be an explicit rule; please keep in sync with the implicit +# one in Makefile.in. +objcp/objcp-act.o : objc/objc-act.c \ + $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \ + $(EXPR_H) $(TARGET_H) $(CXX_TREE_H) $(DIAGNOSTIC_H) toplev.h $(FLAGS_H) \ + objc/objc-act.h input.h $(FUNCTION_H) output.h debug.h langhooks.h \ + objcp/objcp-decl.h $(LANGHOOKS_DEF_H) $(HASHTAB_H) gt-objc-objc-act.h \ + $(TREE_GIMPLE_H) + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) po-generated: |