Invent MOSTLYCLEANDIRS.

diff --git a/ChangeLog b/ChangeLog
index 2b06e7d6f2c0de072292e3f90ec1fc3a6206066a..e58645ef6687f5e6222565fbc6701146541c41b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-23  Simon Josefsson  <jas@extundo.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_emit_lib_Makefile_am): Define MOSTLYCLEANDIRS.
+       Emit mostlyclean-local rule.
+       (func_emit_tests_Makefile_am): Likewise.
+       * modules/sys_socket (Makefile.am): Use MOSTLYCLEANDIRS.
+
 2006-06-23  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-stdint.c: Update to match ISO C 99 Technical

diff --git a/gnulib-tool b/gnulib-tool
index 32a18d0d92d645becb6e8fead4edc33fa66825c0..519e461aaaf423bc1ee33128988644e035f783f4 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-05-09 02:38:16 $'
+cvsdatestamp='$Date: 2006-06-23 19:27:17 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -749,6 +749,7 @@ func_emit_lib_Makefile_am ()
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
   echo "MOSTLYCLEANFILES ="
+  echo "MOSTLYCLEANDIRS ="
   echo "CLEANFILES ="
   echo "DISTCLEANFILES ="
   echo "MAINTAINERCLEANFILES ="
@@ -777,6 +778,14 @@ func_emit_lib_Makefile_am ()
     fi
   done
   echo
+  echo "mostlyclean-local:"
+  echo "       @test -z \"\$(MOSTLYCLEANDIRS)\" || \\"
+  echo "         for dir in \$(MOSTLYCLEANDIRS); do \\"
+  echo "           if test -d \$\$dir; then \\"
+  echo "             echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
+  echo "           fi; \\"
+  echo "         done"
+  echo
   echo "# Makefile.am ends here"
 }
 
@@ -818,6 +827,7 @@ func_emit_tests_Makefile_am ()
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
   echo "MOSTLYCLEANFILES ="
+  echo "MOSTLYCLEANDIRS ="
   echo "CLEANFILES ="
   echo "DISTCLEANFILES ="
   echo "MAINTAINERCLEANFILES ="
@@ -848,6 +858,14 @@ func_emit_tests_Makefile_am ()
   echo "clean-local:"
   echo "       rm -rf SunWS_cache"
   echo
+  echo "mostlyclean-local:"
+  echo "       @test -z \"\$(MOSTLYCLEANDIRS)\" || \\"
+  echo "         for dir in \$(MOSTLYCLEANDIRS); do \\"
+  echo "           if test -d \$\$dir; then \\"
+  echo "             echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
+  echo "           fi; \\"
+  echo "         done"
+  echo
   echo "# Makefile.am ends here"
 }
 

diff --git a/modules/sys_socket b/modules/sys_socket
index 877a1bf39630617e2681c31c85d8a18d521655e6..9c4959da0701d662905c6c0c62d413c509bf2bde 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -21,9 +21,7 @@ sys/socket.h: socket_.h
        cp $(srcdir)/socket_.h $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
-
-mostlyclean-local:
-       -rmdir sys 2>/dev/null
+MOSTLYCLEANDIRS += sys
 
 Include:
 #include <sys/types.h>