* ltmain.in (clean): Automatically remove $objdir (usually '.libs').

diff --git a/ChangeLog b/ChangeLog
index e59f06c7d0c888bb9753b9a5bbd82e71247f3067..346cbe8d354d8bb572a58ca2d4a338359db3f44a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-09  Peter Eisentraut  <peter_e@gmx.net>
+
+       * ltmain.in (clean): Automatically remove $objdir (usually '.libs').
+
 2001-03-08  Gary V. Vaughan  <gvv@techie.com>
 
        * ltconfig.in (library_names_spec): Undo latin-1 spaces I pasted

diff --git a/ltmain.in b/ltmain.in
index 2e90cdda517eff8996687847eb19968aad5790da..8d1d9f985bb7a9a7850e4244370107db9c28185a 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4533,6 +4533,8 @@ relink_command=\"$relink_command\""
       exit 1
     fi
 
+    rmdirs=
+
     for file in $files; do
       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
       if test "X$dir" = "X$file"; then
@@ -4544,6 +4546,14 @@ relink_command=\"$relink_command\""
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
       test $mode = uninstall && objdir="$dir"
 
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test $mode = clean; then
+        case " $rmdirs " in
+         *" $objdir "*) ;;
+         *) rmdirs="$rmdirs $objdir" ;;
+       esac
+      fi
+
       rmfiles="$file"
 
       case $name in
@@ -4612,6 +4622,15 @@ relink_command=\"$relink_command\""
       $show "$rm $rmfiles"
       $run $rm $rmfiles
     done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+        $show "rmdir $dir"
+        $run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
     exit 0
     ;;