Automatically remove $objdir (usually .libs). From Peter Eisentraut <peter_e@gmx...

diff --git a/ChangeLog b/ChangeLog
index 14c7d5d1ed0d37e9f4cc44613588ad033e79761f..3ac9373f809031097e896300fb1b2945229d52a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-25  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 f3ed8a3cd20284408a1bc067af44d54865052efe..1d64d5819ff6436ff287bcad11adb143444ccf14 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -4952,6 +4952,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
@@ -4963,6 +4965,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
@@ -5045,6 +5055,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
     ;;