[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] iconv_open: reduce not-trivial repetition of file-list
From: |
Gary V. Vaughan |
Subject: |
[PATCH 3/7] iconv_open: reduce not-trivial repetition of file-list |
Date: |
Tue, 12 Oct 2010 23:08:38 +0700 |
By itself, this patch reduces unnecessary repetition, but also sets up
a later patch in this series to not need to make yet another copy of
the listed headers.
* modules/iconv_open (iconv_headers): New make macro to hold list of
iconv header files.
(BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Use it instead of
multiple hard-coded copies.
---
ChangeLog | 6 ++++++
modules/iconv_open | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c4e2244..00905b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-10-12 Gary V. Vaughan <address@hidden>
+ iconv_open: reduce not-trivial repetition of file-list
+ * modules/iconv_open (iconv_headers): New make macro to hold list of
+ iconv header files.
+ (BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Use it instead of
+ multiple hard-coded copies.
+
gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
* gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
`libgnu.a' in Makefile.am snippets to be either `$libname.a' or
diff --git a/modules/iconv_open b/modules/iconv_open
index 7b8190f..1a51f08 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -21,6 +21,8 @@ configure.ac:
gl_FUNC_ICONV_OPEN
Makefile.am:
+iconv_headers = iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h
iconv_open-osf.h iconv_open-solaris.h
+
iconv_open-aix.h: iconv_open-aix.gperf
$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf >
$(srcdir)/iconv_open-aix.h-t
mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
@@ -36,10 +38,10 @@ iconv_open-osf.h: iconv_open-osf.gperf
iconv_open-solaris.h: iconv_open-solaris.gperf
$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf >
$(srcdir)/iconv_open-solaris.h-t
mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
-BUILT_SOURCES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h
iconv_open-osf.h iconv_open-solaris.h
+BUILT_SOURCES += $(iconv_headers)
MOSTLYCLEANFILES += iconv_open-aix.h-t iconv_open-hpux.h-t
iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t
-MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h
iconv_open-osf.h iconv_open-solaris.h
-EXTRA_DIST += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h
iconv_open-osf.h iconv_open-solaris.h
+MAINTAINERCLEANFILES += $(iconv_headers)
+EXTRA_DIST += $(iconv_headers)
Include:
<iconv.h>
--
1.7.3
- Re: [PATCH 7/7] libposix: use git-version-gen for version numbering, (continued)
- [PATCH 3/7] iconv_open: reduce not-trivial repetition of file-list,
Gary V. Vaughan <=
[PATCH 1/7] gnulib-tool: transform include guards with `--macro-prefix', Gary V. Vaughan, 2010/10/12
[PATCH 2/7] gnulib-tool: transform hard-coded libgnu.a to $libname.l?a, Gary V. Vaughan, 2010/10/12