From 294d3b8cc948a8e2b5f990bd27ef7b594f8c9e53 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 May 2011 22:31:13 +0200 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ m4/canon-host.m4 | 8 +------- modules/canon-host | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4736aaa0d..73ce0c8b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-23 Bruno Haible + 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 + 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 a012905ea..615da8b93 100644 --- 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 ef9807da4..c9628da2a 100644 --- 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" -- 2.11.0