Changeset 1394 for trunk/src/gcc/libiberty/Makefile.in

Timestamp:

Apr 28, 2004, 6:58:06 AM (21 years ago)

Author:

bird

Message:

#1040: Joined the GCC 3.3.3 with the trunk.

File:

• trunk/src/gcc/libiberty/Makefile.in (modified) (12 diffs, 1 prop)

trunk/src/gcc/libiberty/Makefile.in

@@ -1 +1 @@
 #
 # Makefile
-#   Copyright (C) 1990, 91-99, 2000, 2001, 2003
+#   Copyright (C) 1990, 91-99, 2000, 2001, 2002, 2003
 #   Free Software Foundation
 #
@@ -36 +36 @@
 bindir = @bindir@
 libdir = @libdir@
+includedir = @includedir@
+target_header_dir = @target_header_dir@
 
 SHELL = @SHELL@
@@ -52 +54 @@
 mkinstalldirs = $(SHELL) $(libiberty_topdir)/mkinstalldirs
 
+# Some compilers can't handle cc -c blah.c -o foo/blah.o.
+OUTPUT_OPTION = @OUTPUT_OPTION@
+
 AR = @AR@
 AR_FLAGS = rc
@@ -73 +78 @@
 # A configuration can specify extra .o files that should be included,
 # even if they are in libc. (Perhaps the libc version is buggy.)
-EXTRA_OFILES = 
+EXTRA_OFILES =
 
 # Flags to pass to a recursive make.
@@ -103 +108 @@
 # FIXME: add @BUILD_INFO@ once we're sure it works for everyone.
 all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
-ifeq "$(BUILD_PLATFORM)" "OS2"
-        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
-else
         @: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
-endif
 
 .PHONY: check installcheck
@@ -122 +123 @@
           $(COMPILE.c) $(PICFLAG) $< -o pic/$@; \
         else true; fi
-        $(COMPILE.c) $<
+        $(COMPILE.c) $< $(OUTPUT_OPTION)
 
 # NOTE: If you add new files to the library, add them to this list
@@ -137 +138 @@
         index.c insque.c                                                \
         lbasename.c                                                     \
+        lrealpath.c make-relative-prefix.c                              \
         make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmove.c     \
          memset.c mkstemps.c                                            \
         objalloc.c obstack.c                                            \
-        partition.c pexecute.c putenv.c                                 \
+        partition.c pexecute.c physmem.c putenv.c                       \
         random.c regex.c rename.c rindex.c                              \
         safe-ctype.c setenv.c sigsetmask.c sort.c spaces.c              \
@@ -161 +163 @@
         hashtab.o hex.o                                                 \
         lbasename.o                                                     \
+        lrealpath.o make-relative-prefix.o                              \
         make-temp-file.o                                                \
         objalloc.o obstack.o                                            \
-        partition.o pexecute.o                                          \
+        partition.o physmem.o pexecute.o                                \
         safe-ctype.o sort.o spaces.o splay-tree.o strerror.o            \
          strsignal.o                                                    \
@@ -189 +192 @@
         waitpid.o
 
+# These files are installed if the library has been configured to do so.
+INSTALLED_HEADERS =                                                     \
+        $(INCDIR)/ansidecl.h                                            \
+        $(INCDIR)/demangle.h                                            \
+        $(INCDIR)/dyn-string.h                                          \
+        $(INCDIR)/fibheap.h                                             \
+        $(INCDIR)/floatformat.h                                         \
+        $(INCDIR)/hashtab.h                                             \
+        $(INCDIR)/libiberty.h                                           \
+        $(INCDIR)/objalloc.h                                            \
+        $(INCDIR)/partition.h                                           \
+        $(INCDIR)/safe-ctype.h                                          \
+        $(INCDIR)/sort.h                                                \
+        $(INCDIR)/splay-tree.h                                          \
+        $(INCDIR)/ternary.h
+
 $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
         -rm -f $(TARGETLIB) pic/$(TARGETLIB)
@@ -245 +264 @@
 
 install_to_libdir: all
-        $(mkinstalldirs) $(DESTDIR)$(libdir)$(MULTISUBDIR)
+        ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
         $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
-        ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) && \
-          $(RANLIB) $(TARGETLIB)n && \
-          mv -f $(TARGETLIB)n $(TARGETLIB) )
+        ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
+        mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+        if test -n "${target_header_dir}"; then \
+          case "${target_header_dir}" in \
+            /*)    thd=${target_header_dir};; \
+            *)     thd=${includedir}${MULTISUBDIR}/${target_header_dir};; \
+          esac; \
+          ${mkinstalldirs} $(DESTDIR)$${thd}; \
+          for h in ${INSTALLED_HEADERS}; do \
+            ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
+          done; \
+        fi
         @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
+# This is tricky.  Even though CC in the Makefile contains
+# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+# default multilib, so we have to take LIBCFLAGS into account as well,
+# since it will be passed the multilib flags.
+MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
 install_to_tooldir: all
-        $(mkinstalldirs) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`
-        $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n
-        ( cd $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` && \
-          $(RANLIB) $(TARGETLIB)n && \
-          mv -f $(TARGETLIB)n $(TARGETLIB) )
+        ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
+        $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
+        ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; $(RANLIB) $(TARGETLIB)n )
+        mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
         @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
@@ -412 +444 @@
 lbasename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
         $(INCDIR)/safe-ctype.h
+lrealpath.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 make-temp-file.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 md5.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
@@ -426 +460 @@
 pexecute.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
         $(INCDIR)/safe-ctype.h
+physmem.o: config.h $(INCDIR)/libiberty.h
 putenv.o: config.h $(INCDIR)/ansidecl.h
 random.o: $(INCDIR)/ansidecl.h