--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Bruno Haible  <bruno@clisp.org>
+
+	cloexec: Move AC_LIBOBJ invocations to module description.
+	* m4/cloexec.m4: Remove file.
+	* modules/cloexec (Files): Remove it.
+	(configure.ac): Remove gl_CLOEXEC call.
+	(Makefile.am): Augment lib_SOURCES.
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
 	check-version: Move AC_LIBOBJ invocations to module description.

deleted file mode 100644
--- a/m4/cloexec.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-#serial 6
-dnl Copyright (C) 2004-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_CLOEXEC],
-[
-  AC_LIBOBJ([cloexec])
-])

--- a/modules/cloexec
+++ b/modules/cloexec
@@ -4,7 +4,6 @@
 Files:
 lib/cloexec.c
 lib/cloexec.h
-m4/cloexec.m4
 
 Depends-on:
 dup2
@@ -12,10 +11,10 @@
 stdbool
 
 configure.ac:
-gl_CLOEXEC
 gl_MODULE_INDICATOR_FOR_TESTS([cloexec])
 
 Makefile.am:
+lib_SOURCES += cloexec.c
 
 Include:
 "cloexec.h"