PR ada/60703

[pf3gnuchains/gcc-fork.git] / libobjc / Makefile.in

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index d9f9073..1427bac 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for GNU Objective C runtime library.
 # Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -43,6 +43,7 @@ toolexeclibdir = @toolexeclibdir@
 includedirname = @includedirname@
 libsuffix = @libsuffix@
 
+lt_host_flags = @lt_host_flags@
 extra_ldflags_libobjc = @extra_ldflags_libobjc@
 
 top_builddir = .
@@ -92,7 +93,7 @@ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
 LIBTOOL_CLEAN   = $(LIBTOOL) --mode=clean
 #LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
 
-OBJC_GCFLAGS=-DOBJC_WITH_GC=1
+OBJC_GCFLAGS=@OBJC_GCFLAGS@
 OBJC_BOEHM_GC=@OBJC_BOEHM_GC@
 OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@
 OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)
@@ -100,6 +101,8 @@ OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)
 INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \
   -I$(srcdir)/$(MULTISRCTOP)../gcc/config \
   -I$(MULTIBUILDTOP)../../$(host_subdir)/gcc \
+  -I$(srcdir)/$(MULTISRCTOP)../libgcc \
+  -I$(MULTIBUILDTOP)../libgcc \
   -I$(srcdir)/$(MULTISRCTOP)../include \
   $(OBJC_BOEHM_GC_INCLUDES)
 
@@ -116,58 +119,21 @@ OBJC_H = \
   NXConstStr.h \
   Object.h \
   Protocol.h \
-  encoding.h \
   message.h \
-  objc-api.h \
   objc-decls.h \
   runtime.h \
-  thr.h \
-  \
-  hash.h \
-  objc-list.h \
-  sarray.h \
-  typedstream.h
-
-# User-visible header files containing deprecated APIs, from the
-# objc/deprecated directory
-OBJC_DEPRECATED_H = \
-  METHOD_NULL.h \
-  MetaClass.h \
-  Object.h \
-  STR.h \
-  hash.h \
-  objc-list.h \
-  objc_error.h \
-  objc_get_uninstalled_dtable.h \
-  objc_malloc.h \
-  objc_object_alloc.h \
-  objc_unexpected_exception.h \
-  objc_valloc.h \
-  sarray.h \
-  struct_objc_category.h \
-  struct_objc_class.h \
-  struct_objc_ivar.h \
-  struct_objc_ivar_list.h \
-  struct_objc_method.h \
-  struct_objc_method_list.h \
-  struct_objc_module.h \
-  struct_objc_protocol.h \
-  struct_objc_protocol_list.h \
-  struct_objc_selector.h \
-  struct_objc_static_instances.h \
-  struct_objc_symtab.h \
-  typedstream.h 
+  thr.h
 
 # Objective-C source files to compile
 OBJC_SOURCE_FILES = \
    NXConstStr.m \
    Object.m \
    Protocol.m \
+   accessors.m \
    linking.m
 
 # C source files to compile
 C_SOURCE_FILES = \
-   archive.c \
    class.c \
    encoding.c \
    error.c \
@@ -275,38 +241,15 @@ sendmsg_gc.lo: sendmsg.c runtime-info.h
 
 # These files have separate rules because they require special
 # compiler flags.
-archive.lo: archive.c
-       $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) -Wno-deprecated-declarations \
-          -o $@
-
-archive_gc.lo: archive.c
-       $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -Wno-deprecated-declarations \
-          -o $@
 
-# -Wno-deprecated-declarations is for the objc/typedstream.h functions.
-Object.lo: Object.m
-       $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) -fgnu-runtime -Wno-deprecated-declarations \
-          -o $@
-
-# -Wno-deprecated-declarations is for the objc/typedstream.h functions.
-Object_gc.lo: Object.m
-       $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -fgnu-runtime -Wno-deprecated-declarations \
-          -o $@
-
-# -Wno-deprecated-declarations is to silence warnings from using 
-# _objc_unexpected_exception.
 exception.lo: exception.c
        $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) -fexceptions -Wno-deprecated-declarations \
+          $(ALL_CFLAGS) $(INCLUDES) -fexceptions \
           -o $@
 
 exception_gc.lo: exception.c
        $(LIBTOOL_COMPILE) $(CC) $< -c \
-          $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -fexceptions -Wno-deprecated-declarations \
+          $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -fexceptions \
           -o $@
 
 doc: info dvi pdf html
@@ -321,13 +264,13 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 
 libobjc$(libsuffix).la: $(OBJS)
        $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
-               -rpath $(toolexeclibdir) \
+               -Wc,-shared-libgcc -rpath $(toolexeclibdir) \
                -version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc) \
                $(LTLDFLAGS)
 
 libobjc_gc$(libsuffix).la: $(OBJS_GC)
        $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) $(OBJC_BOEHM_GC_LIBS) \
-               -rpath $(toolexeclibdir) \
+               -Wc,-shared-libgcc -rpath $(toolexeclibdir) \
                -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) \
                $(LTLDFLAGS)
 
@@ -383,11 +326,6 @@ install-headers:
          realfile=$(srcdir)/objc/$${file}; \
          $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc; \
        done
-       $(multi_basedir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedirname)/objc/deprecated
-       for file in $(OBJC_DEPRECATED_H); do \
-         realfile=$(srcdir)/objc/deprecated/$${file}; \
-         $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc/deprecated; \
-       done
 
 check uninstall install-strip dist installcheck installdirs: