In libobjc/:

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

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 891c660..ac042ac 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -141,24 +141,82 @@ FLAGS_TO_PASS = \
 all: libobjc$(libsuffix).la $(OBJC_BOEHM_GC)
        : $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
 
-# User-visible header files.
-
-OBJC_H = hash.h objc-list.h sarray.h objc.h objc-api.h \
-        NXConstStr.h Object.h Protocol.h encoding.h typedstream.h \
-        thr.h objc-decls.h
+# User-visible header files, from the objc/ directory
+
+OBJC_H = \
+  objc.h \
+  objc-exception.h \
+  \
+  NXConstStr.h \
+  Object.h \
+  Protocol.h \
+  encoding.h \
+  hash.h \
+  message.h \
+  objc-api.h \
+  objc-decls.h \
+  objc-list.h \
+  sarray.h \
+  thr.h \
+  typedstream.h
+
+# User-visible header files containing deprecated APIs, from the
+# objc/deprecated directory
+
+OBJC_DEPRECATED_H = \
+  MetaClass.h \
+  Object.h \
+  STR.h \
+  objc_error.h \
+  objc_unexpected_exception.h \
+  struct_objc_class.h \
+  struct_objc_protocol.h \
+  struct_objc_selector.h \
+  typedstream.h 
 
 # Modules that comprise the runtime library.
 
-OBJS =    archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo \
-         misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo \
-         Protocol.lo sarray.lo selector.lo sendmsg.lo thr.lo \
-          exception.lo
-
-OBJS_GC = archive_gc.lo class_gc.lo encoding_gc.lo gc_gc.lo hash_gc.lo \
-         init_gc.lo linking_gc.lo misc_gc.lo nil_method_gc.lo \
-         NXConstStr_gc.lo Object_gc.lo objects_gc.lo Protocol_gc.lo \
-         sarray_gc.lo selector_gc.lo sendmsg_gc.lo thr_gc.lo \
-         exception_gc.lo
+OBJS =  \
+   NXConstStr.lo \
+   Object.lo \
+   Protocol.lo \
+   archive.lo \
+   class.lo \
+   encoding.lo \
+   error.lo \
+   gc.lo \
+   hash.lo \
+   init.lo \
+   linking.lo \
+   memory.lo \
+   nil_method.lo \
+   objects.lo \
+   sarray.lo \
+   selector.lo \
+   sendmsg.lo \
+   thr.lo \
+   exception.lo
+
+OBJS_GC = \
+   NXConstStr_gc.lo \
+   Object_gc.lo \
+   Protocol_gc.lo \
+   archive_gc.lo \
+   class_gc.lo \
+   encoding_gc.lo \
+   error_gc.lo \
+   gc_gc.lo \
+   hash_gc.lo \
+   init_gc.lo \
+   linking_gc.lo \
+   memory_gc.lo \
+   nil_method_gc.lo \
+   objects_gc.lo \
+   sarray_gc.lo \
+   selector_gc.lo \
+   sendmsg_gc.lo \
+   thr_gc.lo \
+   exception_gc.lo
 
 runtime-info.h: 
        echo "" > tmp-runtime.m
@@ -167,7 +225,11 @@ runtime-info.h:
        rm -f tmp-runtime.m tmp-runtime.s
 
 archive_gc.lo: archive.c
-       $(LIBTOOL_COMPILE) $(CC) -c  -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
+       $(LIBTOOL_COMPILE) $(CC) -Wno-deprecated-declarations -c -o $@ $(ALL_CFLAGS) \
+               $(OBJC_GCFLAGS) $(INCLUDES) $<
+
+archive.lo: archive.c
+       $(LIBTOOL_COMPILE) $(CC) -Wno-deprecated-declarations -c $(ALL_CFLAGS) \
                $(INCLUDES) $<
 
 class_gc.lo: class.c
@@ -178,6 +240,10 @@ encoding_gc.lo: encoding.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
                $(INCLUDES) $<
 
+error_gc.lo: error.c
+       $(LIBTOOL_COMPILE) $(CC) -c $(ALL_CFLAGS) -o $@ $(OBJC_GCFLAGS) \
+               $(INCLUDES) $<
+
 gc.lo: gc.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(INCLUDES) $<
 
@@ -201,7 +267,7 @@ linking_gc.lo: linking.m
        $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -c -o $@ $(ALL_CFLAGS) \
                $(OBJC_GCFLAGS) $(INCLUDES) $<
 
-misc_gc.lo: misc.c
+memory_gc.lo: memory.c
        $(LIBTOOL_COMPILE) $(CC) -c $(ALL_CFLAGS) -o $@ $(OBJC_GCFLAGS) \
                $(INCLUDES) $<
 
@@ -217,13 +283,15 @@ NXConstStr_gc.lo: NXConstStr.m
        $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -c -o $@ $(ALL_CFLAGS) \
                $(OBJC_GCFLAGS) $(INCLUDES) $<
 
+# -Wno-deprecated-declarations is for the objc/typedstream.h functions.
 Object.lo: Object.m
-       $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -c -o $@ $(ALL_CFLAGS) \
-               $(INCLUDES) $<
+       $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -Wno-deprecated-declarations \
+               -c -o $@ $(ALL_CFLAGS) $(INCLUDES) $<
 
+# -Wno-deprecated-declarations is for the objc/typedstream.h functions.
 Object_gc.lo: Object.m
-       $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -c -o $@ $(ALL_CFLAGS) \
-               $(OBJC_GCFLAGS) $(INCLUDES) $<
+       $(LIBTOOL_COMPILE) $(CC) -fgnu-runtime -Wno-deprecated-declarations \
+               -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) $(INCLUDES) $<
 
 objects_gc.lo: objects.c
        $(LIBTOOL_COMPILE) $(CC) -c $(ALL_CFLAGS) -o $@ $(OBJC_GCFLAGS) \
@@ -256,13 +324,15 @@ thr_gc.lo: thr.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
                $(INCLUDES) $<
 
+# -Wno-deprecated-declarations is to silence warnings from using 
+# _objc_unexpected_exception.
 exception.lo: exception.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) \
-               -fexceptions $(INCLUDES) $<
+               -fexceptions -Wno-deprecated-declarations $(INCLUDES) $<
 
 exception_gc.lo: exception.c
        $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \
-               -fexceptions $(INCLUDES) $<
+               -fexceptions -Wno-deprecated-declarations $(INCLUDES) $<
 
 doc: info dvi pdf html
 
@@ -338,6 +408,11 @@ 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: