diff options
author | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1998-04-04 06:32:39 -0700 |
commit | e5e809f4194e578b5fbd48fc5a1df2377f28d197 (patch) | |
tree | 6743f11e58bd7a933b08900d973d89026cd11c43 /gcc/objc/Make-lang.in | |
parent | 31031eddacda46a500b2390f52cd4474bcaf84ca (diff) | |
download | gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.zip gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.gz gcc-e5e809f4194e578b5fbd48fc5a1df2377f28d197.tar.bz2 |
* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12
for details.
* haifa-sched.c: Mirror recent changes from gcc2.
From-SVN: r18984
Diffstat (limited to 'gcc/objc/Make-lang.in')
-rw-r--r-- | gcc/objc/Make-lang.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index f5f8289..4b41c9a 100644 --- 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 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998 Free Software Foundation, Inc. #This file is part of GNU CC. @@ -130,7 +130,7 @@ objc/sarray.o: $(srcdir)/objc/sarray.c $(GCC_PASSES) objc/class.o: $(srcdir)/objc/class.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/class.c -o $@ -objc/sendmsg.o: $(srcdir)/objc/sendmsg.c $(GCC_PASSES) +objc/sendmsg.o: $(srcdir)/objc/sendmsg.c $(GCC_PASSES) objc/runtime-info.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) -Iobjc \ -c $(srcdir)/objc/sendmsg.c -o $@ objc/init.o: $(srcdir)/objc/init.c $(GCC_PASSES) @@ -209,10 +209,10 @@ libobjc.dll: libobjc_s.a objc/libobjc_entry.o # Platform generated information needed by ObjC runtime objc/runtime-info.h: cc1obj - echo "" > emptyfile + echo "" > tmp-runtime echo "/* This file is automatically generated */" >$@ - ./cc1obj -print-objc-runtime-info emptyfile >>$@ - + ./cc1obj -print-objc-runtime-info tmp-runtime >>$@ + rm -f tmp-runtime # # Build hooks: @@ -301,9 +301,11 @@ objc.stage4: stage4-start # This target creates the files that can be rebuilt, but go in the # distribution anyway. It then copies the files to the distdir directory. -objc.distdir: +# ??? Note that this should be fixed once the Makefile is fixed to do +# the build in the inner directory. +objc.distdir: $(srcdir)/objc/objc-parse.c mkdir tmp/objc - cd objc ; $(MAKE) $(FLAGS_TO_PASS) objc-parse.c +# cd objc ; $(MAKE) $(FLAGS_TO_PASS) objc-parse.c cd objc; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \ |