[PATCH 12/15] unistdio: support libunistring-optional

[Paolo Bonzini]

* lib/unistdio.h: Rename to...
* lib/unistdio.in.h: ... this.
* modules/unistdio/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/unistdio/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{unistdio.h => unistdio.in.h}   |    0
 modules/unistdio/base               |    4 +++-
 modules/unistdio/u-printf-args      |    2 +-
 modules/unistdio/u16-asnprintf      |    2 +-
 modules/unistdio/u16-asprintf       |    2 +-
 modules/unistdio/u16-printf-parse   |    2 +-
 modules/unistdio/u16-snprintf       |    2 +-
 modules/unistdio/u16-sprintf        |    2 +-
 modules/unistdio/u16-u16-asnprintf  |    2 +-
 modules/unistdio/u16-u16-asprintf   |    2 +-
 modules/unistdio/u16-u16-snprintf   |    2 +-
 modules/unistdio/u16-u16-sprintf    |    2 +-
 modules/unistdio/u16-u16-vasnprintf |    2 +-
 modules/unistdio/u16-u16-vasprintf  |    2 +-
 modules/unistdio/u16-u16-vsnprintf  |    2 +-
 modules/unistdio/u16-u16-vsprintf   |    2 +-
 modules/unistdio/u16-vasnprintf     |    2 +-
 modules/unistdio/u16-vasprintf      |    2 +-
 modules/unistdio/u16-vsnprintf      |    2 +-
 modules/unistdio/u16-vsprintf       |    2 +-
 modules/unistdio/u32-asnprintf      |    2 +-
 modules/unistdio/u32-asprintf       |    2 +-
 modules/unistdio/u32-printf-parse   |    2 +-
 modules/unistdio/u32-snprintf       |    2 +-
 modules/unistdio/u32-sprintf        |    2 +-
 modules/unistdio/u32-u32-asnprintf  |    2 +-
 modules/unistdio/u32-u32-asprintf   |    2 +-
 modules/unistdio/u32-u32-snprintf   |    2 +-
 modules/unistdio/u32-u32-sprintf    |    2 +-
 modules/unistdio/u32-u32-vasnprintf |    2 +-
 modules/unistdio/u32-u32-vasprintf  |    2 +-
 modules/unistdio/u32-u32-vsnprintf  |    2 +-
 modules/unistdio/u32-u32-vsprintf   |    2 +-
 modules/unistdio/u32-vasnprintf     |    2 +-
 modules/unistdio/u32-vasprintf      |    2 +-
 modules/unistdio/u32-vsnprintf      |    2 +-
 modules/unistdio/u32-vsprintf       |    2 +-
 modules/unistdio/u8-asnprintf       |    2 +-
 modules/unistdio/u8-asprintf        |    2 +-
 modules/unistdio/u8-printf-parse    |    2 +-
 modules/unistdio/u8-snprintf        |    2 +-
 modules/unistdio/u8-sprintf         |    2 +-
 modules/unistdio/u8-u8-asnprintf    |    2 +-
 modules/unistdio/u8-u8-asprintf     |    2 +-
 modules/unistdio/u8-u8-snprintf     |    2 +-
 modules/unistdio/u8-u8-sprintf      |    2 +-
 modules/unistdio/u8-u8-vasnprintf   |    2 +-
 modules/unistdio/u8-u8-vasprintf    |    2 +-
 modules/unistdio/u8-u8-vsnprintf    |    2 +-
 modules/unistdio/u8-u8-vsprintf     |    2 +-
 modules/unistdio/u8-vasnprintf      |    2 +-
 modules/unistdio/u8-vasprintf       |    2 +-
 modules/unistdio/u8-vsnprintf       |    2 +-
 modules/unistdio/u8-vsprintf        |    2 +-
 modules/unistdio/ulc-asnprintf      |    2 +-
 modules/unistdio/ulc-asprintf       |    2 +-
 modules/unistdio/ulc-fprintf        |    2 +-
 modules/unistdio/ulc-printf-parse   |    2 +-
 modules/unistdio/ulc-snprintf       |    2 +-
 modules/unistdio/ulc-sprintf        |    2 +-
 modules/unistdio/ulc-vasnprintf     |    2 +-
 modules/unistdio/ulc-vasprintf      |    2 +-
 modules/unistdio/ulc-vfprintf       |    2 +-
 modules/unistdio/ulc-vsnprintf      |    2 +-
 modules/unistdio/ulc-vsprintf       |    2 +-
 65 files changed, 66 insertions(+), 64 deletions(-)
 rename lib/{unistdio.h => unistdio.in.h} (100%)

diff --git a/lib/unistdio.h b/lib/unistdio.in.h
similarity index 100%
rename from lib/unistdio.h
rename to lib/unistdio.in.h
diff --git a/modules/unistdio/base b/modules/unistdio/base
index 290712b..eae91fe 100644
--- a/modules/unistdio/base
+++ b/modules/unistdio/base
@@ -2,12 +2,14 @@ Description:
 Base layer for formatted output to strings.
 
 Files:
-lib/unistdio.h
+lib/unistdio.in.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([unistdio])
 
 Makefile.am:
 
diff --git a/modules/unistdio/u-printf-args b/modules/unistdio/u-printf-args
index eb15f13..d8f4010 100644
--- a/modules/unistdio/u-printf-args
+++ b/modules/unistdio/u-printf-args
@@ -16,9 +16,9 @@ unitypes
 
 configure.ac:
 gl_PREREQ_PRINTF_ARGS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u-printf-args])
 
 Makefile.am:
-lib_SOURCES += unistdio/u-printf-args.c
 
 Include:
 "unistdio/u-printf-args.h"
diff --git a/modules/unistdio/u16-asnprintf b/modules/unistdio/u16-asnprintf
index 78355ac..296edf9 100644
--- a/modules/unistdio/u16-asnprintf
+++ b/modules/unistdio/u16-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u16-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-asprintf b/modules/unistdio/u16-asprintf
index edb2448..d863a30 100644
--- a/modules/unistdio/u16-asprintf
+++ b/modules/unistdio/u16-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-printf-parse 
b/modules/unistdio/u16-printf-parse
index 552715f..d6f8493 100644
--- a/modules/unistdio/u16-printf-parse
+++ b/modules/unistdio/u16-printf-parse
@@ -18,9 +18,9 @@ xsize
 
 configure.ac:
 gl_PREREQ_PRINTF_PARSE
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-printf-parse])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-printf-parse.c
 
 Include:
 "unistdio/u-printf-parse.h"
diff --git a/modules/unistdio/u16-snprintf b/modules/unistdio/u16-snprintf
index 214afe5..d5f9c4e 100644
--- a/modules/unistdio/u16-snprintf
+++ b/modules/unistdio/u16-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-sprintf b/modules/unistdio/u16-sprintf
index 8018a4c..2d808d2 100644
--- a/modules/unistdio/u16-sprintf
+++ b/modules/unistdio/u16-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-asnprintf 
b/modules/unistdio/u16-u16-asnprintf
index d1230b0..f884d70 100644
--- a/modules/unistdio/u16-u16-asnprintf
+++ b/modules/unistdio/u16-u16-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u16-u16-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-asprintf 
b/modules/unistdio/u16-u16-asprintf
index abd44ed..7e6c2b6 100644
--- a/modules/unistdio/u16-u16-asprintf
+++ b/modules/unistdio/u16-u16-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-u16-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-snprintf 
b/modules/unistdio/u16-u16-snprintf
index 0d78a40..43cdfb5 100644
--- a/modules/unistdio/u16-u16-snprintf
+++ b/modules/unistdio/u16-u16-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-u16-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-sprintf b/modules/unistdio/u16-u16-sprintf
index 300e93a..c877cc7 100644
--- a/modules/unistdio/u16-u16-sprintf
+++ b/modules/unistdio/u16-u16-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u16-u16-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-vasnprintf 
b/modules/unistdio/u16-u16-vasnprintf
index c4a9075..bffb2b2 100644
--- a/modules/unistdio/u16-u16-vasnprintf
+++ b/modules/unistdio/u16-u16-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-vasprintf 
b/modules/unistdio/u16-u16-vasprintf
index 3fac74c..279ac81 100644
--- a/modules/unistdio/u16-u16-vasprintf
+++ b/modules/unistdio/u16-u16-vasprintf
@@ -11,9 +11,9 @@ unistdio/u16-u16-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-vsnprintf 
b/modules/unistdio/u16-u16-vsnprintf
index f42e490..4632182 100644
--- a/modules/unistdio/u16-u16-vsnprintf
+++ b/modules/unistdio/u16-u16-vsnprintf
@@ -12,9 +12,9 @@ unistr/u16-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-u16-vsprintf 
b/modules/unistdio/u16-u16-vsprintf
index 6b33c86..b905024 100644
--- a/modules/unistdio/u16-u16-vsprintf
+++ b/modules/unistdio/u16-u16-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-u16-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-u16-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-vasnprintf b/modules/unistdio/u16-vasnprintf
index 094facf..ceedf9f 100644
--- a/modules/unistdio/u16-vasnprintf
+++ b/modules/unistdio/u16-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-vasprintf b/modules/unistdio/u16-vasprintf
index bc148f5..534de57 100644
--- a/modules/unistdio/u16-vasprintf
+++ b/modules/unistdio/u16-vasprintf
@@ -11,9 +11,9 @@ unistdio/u16-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-vsnprintf b/modules/unistdio/u16-vsnprintf
index 3e4f350..b7e6b90 100644
--- a/modules/unistdio/u16-vsnprintf
+++ b/modules/unistdio/u16-vsnprintf
@@ -12,9 +12,9 @@ unistr/u16-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u16-vsprintf b/modules/unistdio/u16-vsprintf
index 20f9300..32df6c7 100644
--- a/modules/unistdio/u16-vsprintf
+++ b/modules/unistdio/u16-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u16-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u16-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-asnprintf b/modules/unistdio/u32-asnprintf
index ec91605..c51d7a0 100644
--- a/modules/unistdio/u32-asnprintf
+++ b/modules/unistdio/u32-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u32-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-asprintf b/modules/unistdio/u32-asprintf
index 5b251d1..49c00cf 100644
--- a/modules/unistdio/u32-asprintf
+++ b/modules/unistdio/u32-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-printf-parse 
b/modules/unistdio/u32-printf-parse
index 5ac29fd..cac40bf 100644
--- a/modules/unistdio/u32-printf-parse
+++ b/modules/unistdio/u32-printf-parse
@@ -18,9 +18,9 @@ xsize
 
 configure.ac:
 gl_PREREQ_PRINTF_PARSE
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-printf-parse])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-printf-parse.c
 
 Include:
 "unistdio/u-printf-parse.h"
diff --git a/modules/unistdio/u32-snprintf b/modules/unistdio/u32-snprintf
index 54c783d..0d89826 100644
--- a/modules/unistdio/u32-snprintf
+++ b/modules/unistdio/u32-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-sprintf b/modules/unistdio/u32-sprintf
index a662796..079209f 100644
--- a/modules/unistdio/u32-sprintf
+++ b/modules/unistdio/u32-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-asnprintf 
b/modules/unistdio/u32-u32-asnprintf
index 4f8dfc6..ea5966e 100644
--- a/modules/unistdio/u32-u32-asnprintf
+++ b/modules/unistdio/u32-u32-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u32-u32-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-asprintf 
b/modules/unistdio/u32-u32-asprintf
index 4dc5bf8..581c8bb 100644
--- a/modules/unistdio/u32-u32-asprintf
+++ b/modules/unistdio/u32-u32-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-u32-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-snprintf 
b/modules/unistdio/u32-u32-snprintf
index 6c355c9..29abde6 100644
--- a/modules/unistdio/u32-u32-snprintf
+++ b/modules/unistdio/u32-u32-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-u32-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-sprintf b/modules/unistdio/u32-u32-sprintf
index e2e3146..5ae3bb9 100644
--- a/modules/unistdio/u32-u32-sprintf
+++ b/modules/unistdio/u32-u32-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u32-u32-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-vasnprintf 
b/modules/unistdio/u32-u32-vasnprintf
index f5481cc..aa2c5cd 100644
--- a/modules/unistdio/u32-u32-vasnprintf
+++ b/modules/unistdio/u32-u32-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-vasprintf 
b/modules/unistdio/u32-u32-vasprintf
index c135191..7e5deb4 100644
--- a/modules/unistdio/u32-u32-vasprintf
+++ b/modules/unistdio/u32-u32-vasprintf
@@ -11,9 +11,9 @@ unistdio/u32-u32-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-vsnprintf 
b/modules/unistdio/u32-u32-vsnprintf
index 96acc62..46bc35b 100644
--- a/modules/unistdio/u32-u32-vsnprintf
+++ b/modules/unistdio/u32-u32-vsnprintf
@@ -12,9 +12,9 @@ unistr/u32-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-u32-vsprintf 
b/modules/unistdio/u32-u32-vsprintf
index bbb8e4d..017f66c 100644
--- a/modules/unistdio/u32-u32-vsprintf
+++ b/modules/unistdio/u32-u32-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-u32-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-u32-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-vasnprintf b/modules/unistdio/u32-vasnprintf
index b48b0c0..a734336 100644
--- a/modules/unistdio/u32-vasnprintf
+++ b/modules/unistdio/u32-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-vasprintf b/modules/unistdio/u32-vasprintf
index dc71f0b..ef9d410 100644
--- a/modules/unistdio/u32-vasprintf
+++ b/modules/unistdio/u32-vasprintf
@@ -11,9 +11,9 @@ unistdio/u32-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-vsnprintf b/modules/unistdio/u32-vsnprintf
index 0979769..a682776 100644
--- a/modules/unistdio/u32-vsnprintf
+++ b/modules/unistdio/u32-vsnprintf
@@ -12,9 +12,9 @@ unistr/u32-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u32-vsprintf b/modules/unistdio/u32-vsprintf
index 102d0f0..bbdb96f 100644
--- a/modules/unistdio/u32-vsprintf
+++ b/modules/unistdio/u32-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u32-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u32-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-asnprintf b/modules/unistdio/u8-asnprintf
index a054248..cc4fca8 100644
--- a/modules/unistdio/u8-asnprintf
+++ b/modules/unistdio/u8-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u8-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-asprintf b/modules/unistdio/u8-asprintf
index 56f78a1..8f95ea5 100644
--- a/modules/unistdio/u8-asprintf
+++ b/modules/unistdio/u8-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-printf-parse b/modules/unistdio/u8-printf-parse
index 6cbc2ed..957d334 100644
--- a/modules/unistdio/u8-printf-parse
+++ b/modules/unistdio/u8-printf-parse
@@ -18,9 +18,9 @@ xsize
 
 configure.ac:
 gl_PREREQ_PRINTF_PARSE
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-printf-parse])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-printf-parse.c
 
 Include:
 "unistdio/u-printf-parse.h"
diff --git a/modules/unistdio/u8-snprintf b/modules/unistdio/u8-snprintf
index ee1fd7a..e44439c 100644
--- a/modules/unistdio/u8-snprintf
+++ b/modules/unistdio/u8-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-sprintf b/modules/unistdio/u8-sprintf
index 72c612b..438742f 100644
--- a/modules/unistdio/u8-sprintf
+++ b/modules/unistdio/u8-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-asnprintf b/modules/unistdio/u8-u8-asnprintf
index c8ddf9d..2fc1352 100644
--- a/modules/unistdio/u8-u8-asnprintf
+++ b/modules/unistdio/u8-u8-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/u8-u8-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-asprintf b/modules/unistdio/u8-u8-asprintf
index 7328938..df935f2 100644
--- a/modules/unistdio/u8-u8-asprintf
+++ b/modules/unistdio/u8-u8-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-u8-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-snprintf b/modules/unistdio/u8-u8-snprintf
index de12c80..1871490 100644
--- a/modules/unistdio/u8-u8-snprintf
+++ b/modules/unistdio/u8-u8-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-u8-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-sprintf b/modules/unistdio/u8-u8-sprintf
index f6e7e74..69f8268 100644
--- a/modules/unistdio/u8-u8-sprintf
+++ b/modules/unistdio/u8-u8-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/u8-u8-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-vasnprintf 
b/modules/unistdio/u8-u8-vasnprintf
index 3d83008..5e5fd37 100644
--- a/modules/unistdio/u8-u8-vasnprintf
+++ b/modules/unistdio/u8-u8-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-vasprintf b/modules/unistdio/u8-u8-vasprintf
index 286c0ae..14a24f2 100644
--- a/modules/unistdio/u8-u8-vasprintf
+++ b/modules/unistdio/u8-u8-vasprintf
@@ -11,9 +11,9 @@ unistdio/u8-u8-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-vsnprintf b/modules/unistdio/u8-u8-vsnprintf
index cc8156a..4da759a 100644
--- a/modules/unistdio/u8-u8-vsnprintf
+++ b/modules/unistdio/u8-u8-vsnprintf
@@ -12,9 +12,9 @@ unistr/u8-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-u8-vsprintf b/modules/unistdio/u8-u8-vsprintf
index ac20f40..8c703b7 100644
--- a/modules/unistdio/u8-u8-vsprintf
+++ b/modules/unistdio/u8-u8-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-u8-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-u8-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-vasnprintf b/modules/unistdio/u8-vasnprintf
index cbad1b3..1f8b36d 100644
--- a/modules/unistdio/u8-vasnprintf
+++ b/modules/unistdio/u8-vasnprintf
@@ -47,9 +47,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-vasprintf b/modules/unistdio/u8-vasprintf
index e280dc1..5fc039a 100644
--- a/modules/unistdio/u8-vasprintf
+++ b/modules/unistdio/u8-vasprintf
@@ -11,9 +11,9 @@ unistdio/u8-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-vsnprintf b/modules/unistdio/u8-vsnprintf
index 680a987..fb9e366 100644
--- a/modules/unistdio/u8-vsnprintf
+++ b/modules/unistdio/u8-vsnprintf
@@ -12,9 +12,9 @@ unistr/u8-cpy
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/u8-vsprintf b/modules/unistdio/u8-vsprintf
index bd092fe..d749e4a 100644
--- a/modules/unistdio/u8-vsprintf
+++ b/modules/unistdio/u8-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/u8-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/u8-vsprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-asnprintf b/modules/unistdio/ulc-asnprintf
index 921c572..ec64e60 100644
--- a/modules/unistdio/ulc-asnprintf
+++ b/modules/unistdio/ulc-asnprintf
@@ -11,9 +11,9 @@ unistdio/base
 unistdio/ulc-vasnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-asnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-asnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-asprintf b/modules/unistdio/ulc-asprintf
index 587436b..1d45a6d 100644
--- a/modules/unistdio/ulc-asprintf
+++ b/modules/unistdio/ulc-asprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/ulc-vasprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-asprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-asprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf
index b03d575..6e902f8 100644
--- a/modules/unistdio/ulc-fprintf
+++ b/modules/unistdio/ulc-fprintf
@@ -11,9 +11,9 @@ fseterr
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-fprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-fprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-printf-parse 
b/modules/unistdio/ulc-printf-parse
index e1f7436..f2a3d8d 100644
--- a/modules/unistdio/ulc-printf-parse
+++ b/modules/unistdio/ulc-printf-parse
@@ -19,9 +19,9 @@ c-ctype
 
 configure.ac:
 gl_PREREQ_PRINTF_PARSE
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-printf-parse])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-printf-parse.c
 
 Include:
 "unistdio/u-printf-parse.h"
diff --git a/modules/unistdio/ulc-snprintf b/modules/unistdio/ulc-snprintf
index 0a56b79..42d6614 100644
--- a/modules/unistdio/ulc-snprintf
+++ b/modules/unistdio/ulc-snprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/ulc-vsnprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-snprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-snprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-sprintf b/modules/unistdio/ulc-sprintf
index 1c87479..47daf0f 100644
--- a/modules/unistdio/ulc-sprintf
+++ b/modules/unistdio/ulc-sprintf
@@ -10,9 +10,9 @@ unistdio/base
 unistdio/ulc-vsprintf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-sprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-sprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf
index 4b95bb8..ae8d201 100644
--- a/modules/unistdio/ulc-vasnprintf
+++ b/modules/unistdio/ulc-vasnprintf
@@ -45,9 +45,9 @@ multiarch
 
 configure.ac:
 gl_PREREQ_VASNPRINTF_WITH_EXTRAS
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-vasnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-vasnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf
index 631daec..b1b2ec1 100644
--- a/modules/unistdio/ulc-vasprintf
+++ b/modules/unistdio/ulc-vasprintf
@@ -11,9 +11,9 @@ unistdio/ulc-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-vasprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-vasprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf
index 81f4cc9..2f15662 100644
--- a/modules/unistdio/ulc-vfprintf
+++ b/modules/unistdio/ulc-vfprintf
@@ -11,9 +11,9 @@ fseterr
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-vfprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-vfprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf
index a4d6fd5..db17988 100644
--- a/modules/unistdio/ulc-vsnprintf
+++ b/modules/unistdio/ulc-vsnprintf
@@ -11,9 +11,9 @@ unistdio/ulc-vasnprintf
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-vsnprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-vsnprintf.c
 
 Include:
 "unistdio.h"
diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf
index 294cd59..5bd2729 100644
--- a/modules/unistdio/ulc-vsprintf
+++ b/modules/unistdio/ulc-vsprintf
@@ -12,9 +12,9 @@ stdint
 errno
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistdio/ulc-vsprintf])
 
 Makefile.am:
-lib_SOURCES += unistdio/ulc-vsprintf.c
 
 Include:
 "unistdio.h"
-- 
1.6.6.1