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.

diff --git a/ChangeLog b/ChangeLog
index 71679911763e01eef85026ee457b1a9f0517fe54..9497db034c89795f48bb96a206a07b0982982b7c 100644 (file)
--- 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.

diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 9d5f40d1c2bb12d60994e2d6366e9dd733982ff5..dcec7e48996b093e3b69304d3bc08dff99ef7b62 100644 (file)
--- 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 @@ dnl with or without modifications, as long as this notice is preserved.
 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])
 

diff --git a/modules/dirname b/modules/dirname
index 888c8bad48bf1ff5cf5d2bc3c9f08e5d1fd14a52..dce323adc7d97f5335d7d0586beae62a87d4ec9f 100644 (file)
--- a/modules/dirname
+++ b/modules/dirname
@@ -16,6 +16,7 @@ gl_DIRNAME
 gl_MODULE_INDICATOR([dirname])
 
 Makefile.am:
+lib_SOURCES += dirname.c basename.c
 
 Include:
 "dirname.h"

diff --git a/modules/dirname-lgpl b/modules/dirname-lgpl
index b380ff98e6625af206ffd5943900df5dd5793f95..4b48a3e5be29c8ed5e36a033800b8f3f9d39c194 100644 (file)
--- a/modules/dirname-lgpl
+++ b/modules/dirname-lgpl
@@ -18,6 +18,7 @@ configure.ac:
 gl_DIRNAME_LGPL
 
 Makefile.am:
+lib_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c
 
 Include:
 "dirname.h"