From 61062b559935404790b29044e916b71f4abc7f6b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 May 2011 23:05:53 +0200 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ m4/dirname.m4 | 8 +------- modules/dirname | 1 + modules/dirname-lgpl | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7167991176..9497db034c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-23 Bruno Haible + + 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 dirent-safer: Move AC_LIBOBJ invocations to module description. diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 9d5f40d1c2..dcec7e4899 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 888c8bad48..dce323adc7 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 b380ff98e6..4b48a3e5be 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" -- 2.30.2