* depcomp: Handle case on SGI when libtool is `yes'.

	* depend2.am (@EXT@.o): Set libtool.
	(@EXT@.lo): Likewise.
	(@EXT@.obj): Likewise.

diff --git a/ChangeLog b/ChangeLog
index d89e759..14b5e71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-12-13  Tom Tromey  <tromey@cygnus.com>
 
+       * depcomp: Handle case on SGI when libtool is `yes'.
+       * depend2.am (@EXT@.o): Set libtool.
+       (@EXT@.lo): Likewise.
+       (@EXT@.obj): Likewise.
+
        * depcomp: Unify dashmstdout and dashXmstdout cases.  Move hp case
        after gcc case.
 

diff --git a/depcomp b/depcomp
index 099de80..7f5e693 100755 (executable)
--- a/depcomp
+++ b/depcomp
@@ -24,6 +24,7 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
+# `libtool' can also be set to `yes' or `no'.
 
 depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
@@ -108,7 +109,12 @@ dashmd)
   ;;
 
 sgi)
-  if "$@" -MDupdate "$tmpdepfile"; then :
+  if test "$libtool" = yes; then
+    "$@" "-Wc,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
   else
     stat=$?
     rm -f "$tmpdepfile"

diff --git a/depend2.am b/depend2.am
index 1c3a5d7..97a8b45 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -22,19 +22,19 @@
 @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@
 
 @EXT@.o:
-@AMDEP@        source='@SOURCE@' object='@OBJ@' @AMDEPBACKSLASH@
+@AMDEP@        source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@
 @AMDEP@        depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
 @AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(@PFX@COMPILE) -c -o @OBJ@ @SOURCE@
 
 LIBTOOL@EXT@.lo:
-LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' @AMDEPBACKSLASH@
+LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
 LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
 LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 LIBTOOL        $(LT@PFX@COMPILE) -c -o @LTOBJ@ @SOURCE@
 
 OBJEXT@EXT@.obj:
-OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' @AMDEPBACKSLASH@
+OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
 OBJEXT@AMDEP@  depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
 OBJEXT@AMDEP@  $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 OBJEXT $(@PFX@COMPILE) -c -o @OBJOBJ@ `cygpath -w @SOURCE@`

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 1c3a5d7..97a8b45 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -22,19 +22,19 @@
 @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@
 
 @EXT@.o:
-@AMDEP@        source='@SOURCE@' object='@OBJ@' @AMDEPBACKSLASH@
+@AMDEP@        source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@
 @AMDEP@        depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
 @AMDEP@        $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(@PFX@COMPILE) -c -o @OBJ@ @SOURCE@
 
 LIBTOOL@EXT@.lo:
-LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' @AMDEPBACKSLASH@
+LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@
 LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@
 LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 LIBTOOL        $(LT@PFX@COMPILE) -c -o @LTOBJ@ @SOURCE@
 
 OBJEXT@EXT@.obj:
-OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' @AMDEPBACKSLASH@
+OBJEXT@AMDEP@  source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@
 OBJEXT@AMDEP@  depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@
 OBJEXT@AMDEP@  $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 OBJEXT $(@PFX@COMPILE) -c -o @OBJOBJ@ `cygpath -w @SOURCE@`

diff --git a/lib/depcomp b/lib/depcomp
index 099de80..7f5e693 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -24,6 +24,7 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
+# `libtool' can also be set to `yes' or `no'.
 
 depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
@@ -108,7 +109,12 @@ dashmd)
   ;;
 
 sgi)
-  if "$@" -MDupdate "$tmpdepfile"; then :
+  if test "$libtool" = yes; then
+    "$@" "-Wc,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
   else
     stat=$?
     rm -f "$tmpdepfile"