canon-host: Move AC_LIBOBJ invocations to module description.

* m4/canon-host.m4 (gl_CANON_HOST): Remove macro.
* modules/canon-host (configure.ac): Invoke gl_PREREQ_CANON_HOST
instead of gl_CANON_HOST.
(Makefile.am): Augment lib_SOURCES.

diff --git a/ChangeLog b/ChangeLog
index 4736aaa..73ce0c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
+       canon-host: Move AC_LIBOBJ invocations to module description.
+       * m4/canon-host.m4 (gl_CANON_HOST): Remove macro.
+       * modules/canon-host (configure.ac): Invoke gl_PREREQ_CANON_HOST
+       instead of gl_CANON_HOST.
+       (Makefile.am): Augment lib_SOURCES.
+
+2011-05-23  Bruno Haible  <bruno@clisp.org>
+
        backupfile: Move AC_LIBOBJ invocations to module description.
        * m4/backupfile.m4 (gl_BACKUPFILE): Remove AC_LIBOBJ invocation.
        * modules/backupfile (Makefile.am): Augment lib_SOURCES.

diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index a012905..615da8b 100644 (file)
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,15 +1,9 @@
-# canon-host.m4 serial 9
+# canon-host.m4 serial 10
 dnl Copyright (C) 2002-2007, 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,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_CANON_HOST],
-[
-  AC_LIBOBJ([canon-host])
-  gl_PREREQ_CANON_HOST
-])
-
 AC_DEFUN([gl_PREREQ_CANON_HOST], [
   :
 ])

diff --git a/modules/canon-host b/modules/canon-host
index ef9807d..c9628da 100644 (file)
--- a/modules/canon-host
+++ b/modules/canon-host
@@ -12,9 +12,10 @@ getaddrinfo
 strdup
 
 configure.ac:
-gl_CANON_HOST
+gl_PREREQ_CANON_HOST
 
 Makefile.am:
+lib_SOURCES += canon-host.c
 
 Include:
 "canon-host.h"