--- gcc/objc/Makefile	2018/04/24 18:03:32	1.1
+++ gcc/objc/Makefile	2018/04/24 18:26:40	1.1.1.5
@@ -1,15 +1,38 @@
-# This makefile is run by the parent dir's makefile.
-# thisdir1=`pwd`; \
-# srcdir1=`cd $(srcdir); pwd`; \
-# cd objc; \
-# $(MAKE) $(MAKEFLAGS) -f $$srcdir1/objc/Makefile libobjc.a \
-#   srcdir=$$srcdir1 tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
-#   GCC_FOR_TARGET="$$thisdir1/xgcc -B$$thisdir1/" \
-#   GCC_CFLAGS="$(GCC_CFLAGS)"
-# Two targets are used by ../Makefile: `all' and `mostlyclean'.
+#  GNU Objective C Runtime Makefile
+#  Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+#
+#  This file is part of GNU CC.
+#
+#  GNU CC is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2, or (at your option) any later version.
+#
+#  GNU CC is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  GNU CC; see the file COPYING.  If not, write to the Free Software
+#  Foundation, 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
+
+#  This makefile is run by the parent dir's makefile.
+#  thisdir1=`pwd`; \
+#  srcdir1=`cd $(srcdir); pwd`; \
+#  cd objc; \
+#  $(MAKE) $(MAKEFLAGS) -f $$srcdir1/objc/Makefile libobjc.a \
+#    srcdir=$$srcdir1 tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
+#    GCC_FOR_TARGET="$$thisdir1/xgcc -B$$thisdir1/" \
+#    GCC_CFLAGS="$(GCC_CFLAGS)" incinstalldir=$$thisdir1/include
+#  Two targets are used by ../Makefile: `all' and `mostlyclean'.
+
+SHELL=/bin/sh
 
 .SUFFIXES: .m
 
+OPTIMIZE= -O
+
 VPATH = $(srcdir)/objc
 
 AR = ar
@@ -19,10 +42,12 @@ AR_FLAGS = rc
 SUBDIR_INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/config
 
 .c.o:
-	$(GCC_FOR_TARGET) -c $(GCC_CFLAGS) $(SUBDIR_INCLUDES) $<
+	$(GCC_FOR_TARGET) $(OPTIMIZE) \
+		-c $(GCC_CFLAGS) $(SUBDIR_INCLUDES) $<
 
 .m.o:
-	$(GCC_FOR_TARGET) -c $(GCC_CFLAGS) $(SUBDIR_INCLUDES) $<
+	$(GCC_FOR_TARGET) $(OPTIMIZE) -fgnu-runtime \
+		-c $(GCC_CFLAGS) $(SUBDIR_INCLUDES) $<
 
 # If we were not invoked from the parent dir,
 # invoke make in the parent dir and have reinvoke this makefile.
@@ -30,21 +55,46 @@ SUBDIR_INCLUDES = -I. -I.. -I$(srcdir) -
 all:
 	cd ..; $(MAKE) sublibobjc.a
 
-libobjc.a: core.o hash.o object.o
+OBJC_O = hash.o sarray.o class.o sendmsg.o init.o archive.o encoding.o \
+         selector.o objects.o misc.o NXConstStr.o Object.o Protocol.o
+
+libobjc.a: $(OBJC_O)
 	-rm -f libobjc.a
-	$(AR) rc libobjc.a object.o core.o hash.o
+	$(AR) rc libobjc.a $?
 # ranlib is run in the parent directory's makefile.
 
-OBJC_H = objc.h objc-proto.h record.h $(srcdir)/assert.h $(srcdir)/gstdarg.h
-HASH_H = hash.h mutex.h
-
-core.o: core.c $(OBJC_H) $(HASH_H) $(srcdir)/gstddef.h
-hash.o: hash.c $(OBJC_H) $(HASH_H) $(srcdir)/gstddef.h
-object.o: object.m object.h $(OBJC_H)
-	$(GCC_FOR_TARGET) -c $(GCC_CFLAGS) $(SUBDIR_INCLUDES) $<
+OBJC_H = hash.h list.h sarray.h objc.h \
+         objc-api.h \
+	 NXConstStr.h Object.h Protocol.h encoding.h typedstream.h
+
+# copy objc headers to installation include directory
+copy-headers: 
+	-rm -fr $(incinstalldir)/objc
+	-mkdir $(incinstalldir)/objc
+	for file in $(OBJC_H); do \
+	  realfile=$(srcdir)/objc/$${file}; \
+	  cp $${realfile} $(incinstalldir)/objc; \
+	  chmod a+r $(incinstalldir)/objc/$${file}; \
+	done
 
 mostlyclean:
-	-rm -f core.o hash.o object.o libobjc.a
+	-rm -f *.o libobjc.a xforward fflags
 clean: mostlyclean
 distclean: mostlyclean
 extraclean: mostlyclean
+
+# For Sun VPATH.
+
+hash.o: hash.c
+sarray.o: sarray.c
+class.o: class.c
+sendmsg.o: sendmsg.c
+init.o: init.c
+archive.o: archive.c
+encoding.o: encoding.c
+selector.o: selector.c
+objects.o: objects.c
+misc.o: misc.c
+NXConstStr.o: NXConstStr.m
+Object.o: Object.m
+Protocol.o: Protocol.m