* objc/Make-lang.in: Create runtime-info.h and libobjc_entry.o in

	the build directory.
	(libobjc.a): Update dependency list.
	(libobjc.dll): Likewise.  Use libobjc_entry.o from the build
	directory.
	(objc/sendmsg.o): Add -Iobjc to find runtime-info.h.
	(objc.mostlyclean): Remove runtime-info.h.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17143 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1add15..b6add4a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Tue Dec 16 15:14:09 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+       * objc/Make-lang.in: Create runtime-info.h and libobjc_entry.o in
+       the build directory.
+       (libobjc.a): Update dependency list.
+       (libobjc.dll): Likewise.  Use libobjc_entry.o from the build
+       directory.
+       (objc/sendmsg.o): Add -Iobjc to find runtime-info.h.
+       (objc.mostlyclean): Remove runtime-info.h.
+
 Fri Dec 19 00:19:42 1997  Richard Henderson  <rth@cygnus.com>
 
        * tree.c (build_range_type): Allow creation of ranges with no maximum.

diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 1122bca..9eaa3b7 100644 (file)
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -131,7 +131,7 @@ 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)
-       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) -Iobjc \
        -c $(srcdir)/objc/sendmsg.c -o $@
 objc/init.o: $(srcdir)/objc/init.c $(GCC_PASSES)
        $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \
@@ -173,7 +173,7 @@ objc/linking.o: $(srcdir)/objc/linking.m $(GCC_PASSES)
        $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \
        -fgnu-runtime -c $(srcdir)/objc/linking.m -o $@
 
-$(srcdir)/objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c $(GCC_PASSES)
+objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c $(GCC_PASSES)
        $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \
        -c $(srcdir)/objc/libobjc_entry.c -o $@
 
@@ -181,7 +181,7 @@ $(OBJC_O): $(GCC_PASSES) cc1obj
 
 # Build the Objective C runtime library.
 libobjc.a: cc1obj specs stmp-int-hdrs libgcc2.ready \
- $(USE_COLLECT2) $(EXTRA_PARTS) $(srcdir)/objc/runtime-info.h $(OBJC_O)
+ $(USE_COLLECT2) $(EXTRA_PARTS) objc/runtime-info.h $(OBJC_O)
        -rm -f libobjc.a
        $(AR) $(AR_FLAGS) libobjc.a $(OBJC_O)
        -if $(RANLIB_TEST) ; then $(RANLIB) libobjc.a; else true; fi
@@ -190,25 +190,25 @@ libobjc_s.a: libobjc.a
        mv libobjc.a libobjc_s.a
 
 # Create a relocatable DLL
-libobjc.dll: libobjc_s.a $(srcdir)/objc/libobjc_entry.o
+libobjc.dll: libobjc_s.a objc/libobjc_entry.o
        $(GCC_FOR_TARGET) -mdll -Wl,--base-file -Wl,libobjc.base \
                -o libobjc.dll libobjc_s.a \
-               $(srcdir)/objc/libobjc_entry.o -lkernel32
+               objc/libobjc_entry.o -lkernel32
        $(DLLTOOL) --dllname libobjc.dll --def $(srcdir)/objc/libobjc.def \
                --base-file libobjc.base --output-exp libobjc.exp
        $(GCC_FOR_TARGET) -mdll -Wl,--base-file libobjc.base libobjc.exp \
                -o libobjc.dll libobjc_s.a \
-               $(srcdir)/objc/libobjc_entry.o -lkernel32
+               objc/libobjc_entry.o -lkernel32
        $(DLLTOOL) --dllname libobjc.dll --def $(srcdir)/objc/libobjc.def \
                --base-file libobjc.base --output-exp libobjc.exp
        $(GCC_FOR_TARGET) libobjc.exp -mdll \
                -o libobjc.dll libobjc_s.a \
-               $(srcdir)/objc/libobjc_entry.o -lkernel32
+               objc/libobjc_entry.o -lkernel32
        $(DLLTOOL) --dllname libobjc.dll --def $(srcdir)/objc/libobjc.def \
                --output-lib libobjc.a
 
 # Platform generated information needed by ObjC runtime
-$(srcdir)/objc/runtime-info.h: cc1obj
+objc/runtime-info.h: cc1obj
        echo "" > emptyfile
        echo "/* This file is automatically generated */" >$@
        ./cc1obj -print-objc-runtime-info emptyfile >>$@
@@ -262,6 +262,7 @@ objc.uninstall:
 objc.mostlyclean:
        -rm -f tmp-objc-prs.y
        -rm -f objc/*$(objext) objc/xforward objc/fflags
+       -rm -f objc/runtime-info.h
        -rm -f libobjc.a libobjc_s.a libobjc.dll
        -rm -f libobjc.base libobjc.exp
 objc.clean: objc.mostlyclean