From: Bruno Haible <bruno@clisp.org>
Date: Mon, 23 May 2011 21:05:53 +0000 (+0200)
Subject: dirname*: Respect rules for use of AC_LIBOBJ.
X-Git-Tag: v0.1~2333
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=61062b559935404790b29044e916b71f4abc7f6b;p=gnulib.git

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 716799117..9497db034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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.
 	* m4/dirent-safer.m4 (gl_DIRENT_SAFER): Remove AC_LIBOBJ invocation.
 	* modules/dirent-safer (Makefile.am): Augment lib_SOURCES.
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 9d5f40d1c..dcec7e489 100644
--- 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 888c8bad4..dce323adc 100644
--- 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 b380ff98e..4b48a3e5b 100644
--- 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"