--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Bruno Haible  <bruno@clisp.org>
+
+	dirname*: Respect rules for use of AC_LIBOBJ.
+	* m4/dirname.m4 (gl_DIRNAME, gl_DIRNAME_LGPL): Remove AC_LIBOBJ
+	invocations.
+	* modules/dirname (Makefile.am): Augment lib_SOURCES.
+	* modules/dirname-lgpl (Makefile.am): Augment lib_SOURCES.
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
 	dirent-safer: Move AC_LIBOBJ invocations to module description.

--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,4 +1,4 @@
-#serial 9   -*- autoconf -*-
+#serial 10   -*- autoconf -*-
 dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,16 +7,10 @@
 AC_DEFUN([gl_DIRNAME],
 [
   AC_REQUIRE([gl_DIRNAME_LGPL])
-  AC_LIBOBJ([basename])
-  AC_LIBOBJ([dirname])
 ])
 
 AC_DEFUN([gl_DIRNAME_LGPL],
 [
-  AC_LIBOBJ([basename-lgpl])
-  AC_LIBOBJ([dirname-lgpl])
-  AC_LIBOBJ([stripslash])
-
   dnl Prerequisites of lib/dirname.h.
   AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
 

--- a/modules/dirname
+++ b/modules/dirname
@@ -16,6 +16,7 @@
 gl_MODULE_INDICATOR([dirname])
 
 Makefile.am:
+lib_SOURCES += dirname.c basename.c
 
 Include:
 "dirname.h"

--- a/modules/dirname-lgpl
+++ b/modules/dirname-lgpl
@@ -18,6 +18,7 @@
 gl_DIRNAME_LGPL
 
 Makefile.am:
+lib_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c
 
 Include:
 "dirname.h"