# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1306185829 -7200
# Node ID 84e95b30c2dcf314a911d6ed4ffb1ad0fe75be0f
# Parent  bcfa50eea71d6201e80ab44e1845df22c857098c
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.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4
--- 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 @@
 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
--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -14,6 +14,7 @@
 gl_MODULE_INDICATOR([filenamecat])
 
 Makefile.am:
+lib_SOURCES += filenamecat.c
 
 Include:
 "filenamecat.h"
diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl
--- a/modules/filenamecat-lgpl
+++ b/modules/filenamecat-lgpl
@@ -13,6 +13,7 @@
 gl_FILE_NAME_CONCAT_LGPL
 
 Makefile.am:
+lib_SOURCES += filenamecat-lgpl.c
 
 Include:
 "filenamecat.h"