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
index 34505f1..5772cf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
+       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  <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.

diff --git a/m4/file-type.m4 b/m4/file-type.m4
deleted file mode 100644 (file)
index d90cae2..0000000
--- 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
index 806c60d..47150ae 100644 (file)
--- a/modules/file-type
+++ b/modules/file-type
@@ -4,16 +4,15 @@ Return a string describing the type of a file.
 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"