# HG changeset patch # User Bruno Haible # Date 1306185941 -7200 # Node ID b41b964bc2551ee32b477142ceffc6bfdcc743af # Parent 84e95b30c2dcf314a911d6ed4ffb1ad0fe75be0f file-type: Move AC_LIBOBJ invocations to module description. * m4/file-type.m4: Remove file. * modules/file-type (Files): Remove it. (configure.ac): Remove gl_FILE_TYPE call. (Makefile.am): Augment lib_SOURCES. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-23 Bruno Haible + + file-type: Move AC_LIBOBJ invocations to module description. + * m4/file-type.m4: Remove file. + * modules/file-type (Files): Remove it. + (configure.ac): Remove gl_FILE_TYPE call. + (Makefile.am): Augment lib_SOURCES. + 2011-05-23 Bruno Haible filenamecat*: Respect rules for use of AC_LIBOBJ. diff --git a/m4/file-type.m4 b/m4/file-type.m4 deleted file mode 100644 --- a/m4/file-type.m4 +++ /dev/null @@ -1,10 +0,0 @@ -# file-type.m4 serial 6 -dnl Copyright (C) 2002, 2005-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, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_FILE_TYPE], -[ - AC_LIBOBJ([file-type]) -]) diff --git a/modules/file-type b/modules/file-type --- a/modules/file-type +++ b/modules/file-type @@ -4,16 +4,15 @@ Files: lib/file-type.h lib/file-type.c -m4/file-type.m4 Depends-on: gettext-h sys_stat configure.ac: -gl_FILE_TYPE Makefile.am: +lib_SOURCES += file-type.c Include: "file-type.h"