diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/filenamecat.m4 | 5 | ||||
| -rw-r--r-- | modules/filenamecat | 1 | ||||
| -rw-r--r-- | modules/filenamecat-lgpl | 1 |
4 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2011-05-23 Bruno Haible <bruno@clisp.org> + filenamecat*: Respect rules for use of AC_LIBOBJ. + * m4/filenamecat.m4 (gl_FILE_NAME_CONCAT, gl_FILE_NAME_CONCAT_LGPL): + Remove AC_LIBOBJ invocation. + * modules/filenamecat (Makefile.am): Augment lib_SOURCES. + * modules/filenamecat-lgpl (Makefile.am): Augment lib_SOURCES. + +2011-05-23 Bruno Haible <bruno@clisp.org> + filemode: Move AC_LIBOBJ invocations to module description. * m4/filemode.m4 (gl_FILEMODE): Remove AC_LIBOBJ invocation. * modules/filemode (Makefile.am): Augment lib_SOURCES. diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index b90cf9e8dc..fb7f4436b3 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,4 +1,4 @@ -# filenamecat.m4 serial 10 +# filenamecat.m4 serial 11 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,13 +7,10 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FILE_NAME_CONCAT], [ AC_REQUIRE([gl_FILE_NAME_CONCAT_LGPL]) - AC_LIBOBJ([filenamecat]) ]) AC_DEFUN([gl_FILE_NAME_CONCAT_LGPL], [ - AC_LIBOBJ([filenamecat-lgpl]) - dnl Prerequisites of lib/filenamecat-lgpl.c. AC_CHECK_FUNCS_ONCE([mempcpy]) ]) diff --git a/modules/filenamecat b/modules/filenamecat index 6a10f6258b..6339d9d246 100644 --- a/modules/filenamecat +++ b/modules/filenamecat @@ -14,6 +14,7 @@ gl_FILE_NAME_CONCAT gl_MODULE_INDICATOR([filenamecat]) Makefile.am: +lib_SOURCES += filenamecat.c Include: "filenamecat.h" diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl index 4dd39933b1..a6415017c3 100644 --- a/modules/filenamecat-lgpl +++ b/modules/filenamecat-lgpl @@ -13,6 +13,7 @@ configure.ac: gl_FILE_NAME_CONCAT_LGPL Makefile.am: +lib_SOURCES += filenamecat-lgpl.c Include: "filenamecat.h" |