long-options: Move AC_LIBOBJ invocations to module description.

* m4/long-options.m4: Remove file.
* modules/long-options (Files): Remove it.
(configure.ac): Remove gl_LONG_OPTIONS call.
(Makefile.am): Augment lib_SOURCES.

diff --git a/ChangeLog b/ChangeLog
index 3db4d069069ded290afa7081dfc39cb5c2d876e4..45c9eaa6cc7c1cd21e970e15ba88624fa56b9351 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Bruno Haible  <bruno@clisp.org>
+
+       long-options: Move AC_LIBOBJ invocations to module description.
+       * m4/long-options.m4: Remove file.
+       * modules/long-options (Files): Remove it.
+       (configure.ac): Remove gl_LONG_OPTIONS call.
+       (Makefile.am): Augment lib_SOURCES.
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
        i-ring: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/long-options.m4 b/m4/long-options.m4
deleted file mode 100644 (file)
index 5e8df5e..0000000
--- a/m4/long-options.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-# long-options.m4 serial 5
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
-dnl 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_LONG_OPTIONS],
-[
-  AC_LIBOBJ([long-options])
-
-  dnl Prerequisites of lib/long-options.c.
-])

diff --git a/modules/long-options b/modules/long-options
index 207610c63dc5ca491b82c39c1ad3526c9abc323f..f1106c3cc740064ef2e30d693912a65e9410d30a 100644 (file)
--- a/modules/long-options
+++ b/modules/long-options
@@ -4,7 +4,6 @@ Handle --help and --version options.
 Files:
 lib/long-options.h
 lib/long-options.c
-m4/long-options.m4
 
 Depends-on:
 getopt-gnu
@@ -12,9 +11,9 @@ stdlib
 version-etc
 
 configure.ac:
-gl_LONG_OPTIONS
 
 Makefile.am:
+lib_SOURCES += long-options.c
 
 Include:
 "long-options.h"