bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 13/15] unistr: support libunistring-optional


From: Paolo Bonzini
Subject: [PATCH 13/15] unistr: support libunistring-optional
Date: Sat, 10 Apr 2010 13:24:23 +0200

* lib/unistr.h: Rename to...
* lib/unistr.in.h: ... this.
* modules/unistr/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/unistr/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{unistr.h => unistr.in.h}    |    0
 modules/unistr/base              |    4 +++-
 modules/unistr/u16-check         |    2 +-
 modules/unistr/u16-chr           |    2 +-
 modules/unistr/u16-cmp           |    2 +-
 modules/unistr/u16-cmp2          |    2 +-
 modules/unistr/u16-cpy           |    2 +-
 modules/unistr/u16-cpy-alloc     |    2 +-
 modules/unistr/u16-endswith      |    2 +-
 modules/unistr/u16-mblen         |    2 +-
 modules/unistr/u16-mbsnlen       |    2 +-
 modules/unistr/u16-mbtouc        |    2 +-
 modules/unistr/u16-mbtouc-unsafe |    2 +-
 modules/unistr/u16-mbtoucr       |    2 +-
 modules/unistr/u16-move          |    2 +-
 modules/unistr/u16-next          |    2 +-
 modules/unistr/u16-prev          |    2 +-
 modules/unistr/u16-set           |    2 +-
 modules/unistr/u16-startswith    |    2 +-
 modules/unistr/u16-stpcpy        |    2 +-
 modules/unistr/u16-stpncpy       |    2 +-
 modules/unistr/u16-strcat        |    2 +-
 modules/unistr/u16-strchr        |    2 +-
 modules/unistr/u16-strcmp        |    2 +-
 modules/unistr/u16-strcoll       |    2 +-
 modules/unistr/u16-strcpy        |    2 +-
 modules/unistr/u16-strcspn       |    2 +-
 modules/unistr/u16-strdup        |    2 +-
 modules/unistr/u16-strlen        |    2 +-
 modules/unistr/u16-strmblen      |    2 +-
 modules/unistr/u16-strmbtouc     |    2 +-
 modules/unistr/u16-strncat       |    2 +-
 modules/unistr/u16-strncmp       |    2 +-
 modules/unistr/u16-strncpy       |    2 +-
 modules/unistr/u16-strnlen       |    2 +-
 modules/unistr/u16-strpbrk       |    2 +-
 modules/unistr/u16-strrchr       |    2 +-
 modules/unistr/u16-strspn        |    2 +-
 modules/unistr/u16-strstr        |    2 +-
 modules/unistr/u16-strtok        |    2 +-
 modules/unistr/u16-to-u32        |    2 +-
 modules/unistr/u16-to-u8         |    2 +-
 modules/unistr/u16-uctomb        |    2 +-
 modules/unistr/u32-check         |    2 +-
 modules/unistr/u32-chr           |    2 +-
 modules/unistr/u32-cmp           |    2 +-
 modules/unistr/u32-cmp2          |    2 +-
 modules/unistr/u32-cpy           |    2 +-
 modules/unistr/u32-cpy-alloc     |    2 +-
 modules/unistr/u32-endswith      |    2 +-
 modules/unistr/u32-mblen         |    2 +-
 modules/unistr/u32-mbsnlen       |    2 +-
 modules/unistr/u32-mbtouc        |    2 +-
 modules/unistr/u32-mbtouc-unsafe |    2 +-
 modules/unistr/u32-mbtoucr       |    2 +-
 modules/unistr/u32-move          |    2 +-
 modules/unistr/u32-next          |    2 +-
 modules/unistr/u32-prev          |    2 +-
 modules/unistr/u32-set           |    2 +-
 modules/unistr/u32-startswith    |    2 +-
 modules/unistr/u32-stpcpy        |    2 +-
 modules/unistr/u32-stpncpy       |    2 +-
 modules/unistr/u32-strcat        |    2 +-
 modules/unistr/u32-strchr        |    2 +-
 modules/unistr/u32-strcmp        |    2 +-
 modules/unistr/u32-strcoll       |    2 +-
 modules/unistr/u32-strcpy        |    2 +-
 modules/unistr/u32-strcspn       |    2 +-
 modules/unistr/u32-strdup        |    2 +-
 modules/unistr/u32-strlen        |    2 +-
 modules/unistr/u32-strmblen      |    2 +-
 modules/unistr/u32-strmbtouc     |    2 +-
 modules/unistr/u32-strncat       |    2 +-
 modules/unistr/u32-strncmp       |    2 +-
 modules/unistr/u32-strncpy       |    2 +-
 modules/unistr/u32-strnlen       |    2 +-
 modules/unistr/u32-strpbrk       |    2 +-
 modules/unistr/u32-strrchr       |    2 +-
 modules/unistr/u32-strspn        |    2 +-
 modules/unistr/u32-strstr        |    2 +-
 modules/unistr/u32-strtok        |    2 +-
 modules/unistr/u32-to-u16        |    2 +-
 modules/unistr/u32-to-u8         |    2 +-
 modules/unistr/u32-uctomb        |    2 +-
 modules/unistr/u8-check          |    2 +-
 modules/unistr/u8-chr            |    2 +-
 modules/unistr/u8-cmp            |    2 +-
 modules/unistr/u8-cmp2           |    2 +-
 modules/unistr/u8-cpy            |    2 +-
 modules/unistr/u8-cpy-alloc      |    2 +-
 modules/unistr/u8-endswith       |    2 +-
 modules/unistr/u8-mblen          |    2 +-
 modules/unistr/u8-mbsnlen        |    2 +-
 modules/unistr/u8-mbtouc         |    2 +-
 modules/unistr/u8-mbtouc-unsafe  |    2 +-
 modules/unistr/u8-mbtoucr        |    2 +-
 modules/unistr/u8-move           |    2 +-
 modules/unistr/u8-next           |    2 +-
 modules/unistr/u8-prev           |    2 +-
 modules/unistr/u8-set            |    2 +-
 modules/unistr/u8-startswith     |    2 +-
 modules/unistr/u8-stpcpy         |    2 +-
 modules/unistr/u8-stpncpy        |    2 +-
 modules/unistr/u8-strcat         |    2 +-
 modules/unistr/u8-strchr         |    2 +-
 modules/unistr/u8-strcmp         |    2 +-
 modules/unistr/u8-strcoll        |    2 +-
 modules/unistr/u8-strcpy         |    2 +-
 modules/unistr/u8-strcspn        |    2 +-
 modules/unistr/u8-strdup         |    2 +-
 modules/unistr/u8-strlen         |    2 +-
 modules/unistr/u8-strmblen       |    2 +-
 modules/unistr/u8-strmbtouc      |    2 +-
 modules/unistr/u8-strncat        |    2 +-
 modules/unistr/u8-strncmp        |    2 +-
 modules/unistr/u8-strncpy        |    2 +-
 modules/unistr/u8-strnlen        |    2 +-
 modules/unistr/u8-strpbrk        |    2 +-
 modules/unistr/u8-strrchr        |    2 +-
 modules/unistr/u8-strspn         |    2 +-
 modules/unistr/u8-strstr         |    2 +-
 modules/unistr/u8-strtok         |    2 +-
 modules/unistr/u8-to-u16         |    2 +-
 modules/unistr/u8-to-u32         |    2 +-
 modules/unistr/u8-uctomb         |    2 +-
 125 files changed, 126 insertions(+), 124 deletions(-)
 rename lib/{unistr.h => unistr.in.h} (100%)

diff --git a/lib/unistr.h b/lib/unistr.in.h
similarity index 100%
rename from lib/unistr.h
rename to lib/unistr.in.h
diff --git a/modules/unistr/base b/modules/unistr/base
index 06846a6..c1d5b24 100644
--- a/modules/unistr/base
+++ b/modules/unistr/base
@@ -2,7 +2,8 @@ Description:
 Base layer for elementary Unicode string functions.
 
 Files:
-lib/unistr.h
+lib/unistr.in.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
@@ -11,6 +12,7 @@ stdbool
 inline
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([unistr])
 
 Makefile.am:
 
diff --git a/modules/unistr/u16-check b/modules/unistr/u16-check
index b16b01b..f67a6f9 100644
--- a/modules/unistr/u16-check
+++ b/modules/unistr/u16-check
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-check])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-check.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-chr b/modules/unistr/u16-chr
index 7ef4abe..0f1681c 100644
--- a/modules/unistr/u16-chr
+++ b/modules/unistr/u16-chr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-chr])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-chr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-cmp b/modules/unistr/u16-cmp
index f9c2754..679edb7 100644
--- a/modules/unistr/u16-cmp
+++ b/modules/unistr/u16-cmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-cmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-cmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-cmp2 b/modules/unistr/u16-cmp2
index c384426..bd28bdb 100644
--- a/modules/unistr/u16-cmp2
+++ b/modules/unistr/u16-cmp2
@@ -11,9 +11,9 @@ unistr/u16-cmp
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-cmp2])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-cmp2.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-cpy b/modules/unistr/u16-cpy
index f72179d..38fd421 100644
--- a/modules/unistr/u16-cpy
+++ b/modules/unistr/u16-cpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-cpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-cpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-cpy-alloc b/modules/unistr/u16-cpy-alloc
index 74395f4..2f1465d 100644
--- a/modules/unistr/u16-cpy-alloc
+++ b/modules/unistr/u16-cpy-alloc
@@ -10,9 +10,9 @@ unistr/base
 malloc-posix
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-cpy-alloc])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-cpy-alloc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-endswith b/modules/unistr/u16-endswith
index fd27b15..47f9886 100644
--- a/modules/unistr/u16-endswith
+++ b/modules/unistr/u16-endswith
@@ -11,9 +11,9 @@ unistr/u16-strlen
 unistr/u16-cmp
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-endswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-endswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-mblen b/modules/unistr/u16-mblen
index f557aaf..7df4539 100644
--- a/modules/unistr/u16-mblen
+++ b/modules/unistr/u16-mblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-mblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-mbsnlen b/modules/unistr/u16-mbsnlen
index 6d8ba47..ff3213e 100644
--- a/modules/unistr/u16-mbsnlen
+++ b/modules/unistr/u16-mbsnlen
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-mbtoucr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-mbsnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbsnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-mbtouc b/modules/unistr/u16-mbtouc
index 1febbc2..9767161 100644
--- a/modules/unistr/u16-mbtouc
+++ b/modules/unistr/u16-mbtouc
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-mbtouc])
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-mbtouc unistr/u16-mbtouc-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-mbtouc-unsafe b/modules/unistr/u16-mbtouc-unsafe
index 6213dc5..a9cae2c 100644
--- a/modules/unistr/u16-mbtouc-unsafe
+++ b/modules/unistr/u16-mbtouc-unsafe
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-mbtouc-unsafe])
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-mbtouc-unsafe 
unistr/u16-mbtouc-unsafe-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtouc-unsafe.c unistr/u16-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-mbtoucr b/modules/unistr/u16-mbtoucr
index 8e1a7e3..b6be0d0 100644
--- a/modules/unistr/u16-mbtoucr
+++ b/modules/unistr/u16-mbtoucr
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-mbtoucr])
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-mbtoucr])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-mbtoucr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-move b/modules/unistr/u16-move
index fd0a0b6..26b9cbd 100644
--- a/modules/unistr/u16-move
+++ b/modules/unistr/u16-move
@@ -10,9 +10,9 @@ unistr/base
 memmove
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-move])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-move.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-next b/modules/unistr/u16-next
index b184625..8d2a92f 100644
--- a/modules/unistr/u16-next
+++ b/modules/unistr/u16-next
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-strmbtouc
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-next])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-next.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-prev b/modules/unistr/u16-prev
index 88c754e..acc469c 100644
--- a/modules/unistr/u16-prev
+++ b/modules/unistr/u16-prev
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-prev])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-prev.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-set b/modules/unistr/u16-set
index d3c1899..7d6d5f5 100644
--- a/modules/unistr/u16-set
+++ b/modules/unistr/u16-set
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-set])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-set.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-startswith b/modules/unistr/u16-startswith
index 7c82e2f..c51f33d 100644
--- a/modules/unistr/u16-startswith
+++ b/modules/unistr/u16-startswith
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-startswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-startswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-stpcpy b/modules/unistr/u16-stpcpy
index 37e2b44..f0eea32 100644
--- a/modules/unistr/u16-stpcpy
+++ b/modules/unistr/u16-stpcpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-stpcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-stpcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-stpncpy b/modules/unistr/u16-stpncpy
index e3e4789..7cb140f 100644
--- a/modules/unistr/u16-stpncpy
+++ b/modules/unistr/u16-stpncpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-stpncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-stpncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strcat b/modules/unistr/u16-strcat
index dcf8069..3413451 100644
--- a/modules/unistr/u16-strcat
+++ b/modules/unistr/u16-strcat
@@ -10,9 +10,9 @@ unistr/base
 unistr/u16-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strcat])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strcat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strchr b/modules/unistr/u16-strchr
index 555695f..f4c13e7 100644
--- a/modules/unistr/u16-strchr
+++ b/modules/unistr/u16-strchr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strcmp b/modules/unistr/u16-strcmp
index 7bfcf6c..9c9f020 100644
--- a/modules/unistr/u16-strcmp
+++ b/modules/unistr/u16-strcmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strcmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strcmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strcoll b/modules/unistr/u16-strcoll
index dadf366..a930227 100644
--- a/modules/unistr/u16-strcoll
+++ b/modules/unistr/u16-strcoll
@@ -11,9 +11,9 @@ unistr/u16-strcmp
 uniconv/u16-strconv-to-locale
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strcoll])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strcoll.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strcpy b/modules/unistr/u16-strcpy
index f2b227c..635405f 100644
--- a/modules/unistr/u16-strcpy
+++ b/modules/unistr/u16-strcpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strcspn b/modules/unistr/u16-strcspn
index ed318e3..52b5f5b 100644
--- a/modules/unistr/u16-strcspn
+++ b/modules/unistr/u16-strcspn
@@ -12,9 +12,9 @@ unistr/u16-strmbtouc
 unistr/u16-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strcspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strcspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strdup b/modules/unistr/u16-strdup
index 6c00027..20d7571 100644
--- a/modules/unistr/u16-strdup
+++ b/modules/unistr/u16-strdup
@@ -10,9 +10,9 @@ unistr/base
 unistr/u16-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strdup])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strdup.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strlen b/modules/unistr/u16-strlen
index f2282c5..711a9dc 100644
--- a/modules/unistr/u16-strlen
+++ b/modules/unistr/u16-strlen
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strmblen b/modules/unistr/u16-strmblen
index 74611d8..1fb422f 100644
--- a/modules/unistr/u16-strmblen
+++ b/modules/unistr/u16-strmblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strmblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strmblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strmbtouc b/modules/unistr/u16-strmbtouc
index 7ee5164..5af951a 100644
--- a/modules/unistr/u16-strmbtouc
+++ b/modules/unistr/u16-strmbtouc
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strmbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strmbtouc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strncat b/modules/unistr/u16-strncat
index e5e28c3..db6bd6f 100644
--- a/modules/unistr/u16-strncat
+++ b/modules/unistr/u16-strncat
@@ -10,9 +10,9 @@ unistr/base
 unistr/u16-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strncat])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strncat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strncmp b/modules/unistr/u16-strncmp
index c4c164b..711f033 100644
--- a/modules/unistr/u16-strncmp
+++ b/modules/unistr/u16-strncmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strncmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strncmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strncpy b/modules/unistr/u16-strncpy
index 6a2042d..f374857 100644
--- a/modules/unistr/u16-strncpy
+++ b/modules/unistr/u16-strncpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strnlen b/modules/unistr/u16-strnlen
index d285f3b..285ef44 100644
--- a/modules/unistr/u16-strnlen
+++ b/modules/unistr/u16-strnlen
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strpbrk b/modules/unistr/u16-strpbrk
index b66ef56..86a01da 100644
--- a/modules/unistr/u16-strpbrk
+++ b/modules/unistr/u16-strpbrk
@@ -11,9 +11,9 @@ unistr/u16-strmbtouc
 unistr/u16-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strpbrk])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strpbrk.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strrchr b/modules/unistr/u16-strrchr
index 4ceddbc..15428b4 100644
--- a/modules/unistr/u16-strrchr
+++ b/modules/unistr/u16-strrchr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strrchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strrchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strspn b/modules/unistr/u16-strspn
index 8429d47..47d53fd 100644
--- a/modules/unistr/u16-strspn
+++ b/modules/unistr/u16-strspn
@@ -13,9 +13,9 @@ unistr/u16-cmp
 unistr/u16-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strstr b/modules/unistr/u16-strstr
index c98dc71..078fd37 100644
--- a/modules/unistr/u16-strstr
+++ b/modules/unistr/u16-strstr
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strstr])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strstr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-strtok b/modules/unistr/u16-strtok
index 2eb33b0..eace154 100644
--- a/modules/unistr/u16-strtok
+++ b/modules/unistr/u16-strtok
@@ -11,9 +11,9 @@ unistr/u16-strspn
 unistr/u16-strpbrk
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-strtok])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-strtok.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-to-u32 b/modules/unistr/u16-to-u32
index bb2e488..c2bd250 100644
--- a/modules/unistr/u16-to-u32
+++ b/modules/unistr/u16-to-u32
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-mbtoucr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-to-u32])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-to-u32.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-to-u8 b/modules/unistr/u16-to-u8
index a9bd312..11853e0 100644
--- a/modules/unistr/u16-to-u8
+++ b/modules/unistr/u16-to-u8
@@ -10,9 +10,9 @@ unistr/u16-mbtoucr
 unistr/u8-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-to-u8])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-to-u8.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u16-uctomb b/modules/unistr/u16-uctomb
index 8c14f2e..4cda392 100644
--- a/modules/unistr/u16-uctomb
+++ b/modules/unistr/u16-uctomb
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u16-uctomb])
+gl_LIBUNISTRING_LIBOBJ([unistr/u16-uctomb unistr/u16-uctomb-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u16-uctomb.c unistr/u16-uctomb-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-check b/modules/unistr/u32-check
index 030286d..00140c2 100644
--- a/modules/unistr/u32-check
+++ b/modules/unistr/u32-check
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-check])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-check.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-chr b/modules/unistr/u32-chr
index 101c1b7..4073f5f 100644
--- a/modules/unistr/u32-chr
+++ b/modules/unistr/u32-chr
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-chr])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-chr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-cmp b/modules/unistr/u32-cmp
index 594b445..400a667 100644
--- a/modules/unistr/u32-cmp
+++ b/modules/unistr/u32-cmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-cmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-cmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-cmp2 b/modules/unistr/u32-cmp2
index a65872b..7227450 100644
--- a/modules/unistr/u32-cmp2
+++ b/modules/unistr/u32-cmp2
@@ -11,9 +11,9 @@ unistr/u32-cmp
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-cmp2])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-cmp2.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-cpy b/modules/unistr/u32-cpy
index 97ae099..95676b3 100644
--- a/modules/unistr/u32-cpy
+++ b/modules/unistr/u32-cpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-cpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-cpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-cpy-alloc b/modules/unistr/u32-cpy-alloc
index d6dd635..3d468c0 100644
--- a/modules/unistr/u32-cpy-alloc
+++ b/modules/unistr/u32-cpy-alloc
@@ -10,9 +10,9 @@ unistr/base
 malloc-posix
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-cpy-alloc])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-cpy-alloc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-endswith b/modules/unistr/u32-endswith
index 0ba7248..4787fe8 100644
--- a/modules/unistr/u32-endswith
+++ b/modules/unistr/u32-endswith
@@ -11,9 +11,9 @@ unistr/u32-strlen
 unistr/u32-cmp
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-endswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-endswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-mblen b/modules/unistr/u32-mblen
index eb28b55..9b0649e 100644
--- a/modules/unistr/u32-mblen
+++ b/modules/unistr/u32-mblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-mblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-mblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-mbsnlen b/modules/unistr/u32-mbsnlen
index 8484d7f..1eb28ca 100644
--- a/modules/unistr/u32-mbsnlen
+++ b/modules/unistr/u32-mbsnlen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-mbsnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-mbsnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-mbtouc b/modules/unistr/u32-mbtouc
index 35c33c1..7de5bf8 100644
--- a/modules/unistr/u32-mbtouc
+++ b/modules/unistr/u32-mbtouc
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u32-mbtouc])
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-mbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-mbtouc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-mbtouc-unsafe b/modules/unistr/u32-mbtouc-unsafe
index 94d25a1..5f64f9c 100644
--- a/modules/unistr/u32-mbtouc-unsafe
+++ b/modules/unistr/u32-mbtouc-unsafe
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u32-mbtouc-unsafe])
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-mbtouc-unsafe])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-mbtouc-unsafe.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-mbtoucr b/modules/unistr/u32-mbtoucr
index 37493b7..9bee00f 100644
--- a/modules/unistr/u32-mbtoucr
+++ b/modules/unistr/u32-mbtoucr
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u32-mbtoucr])
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-mbtoucr])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-mbtoucr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-move b/modules/unistr/u32-move
index 2cc237b..7bd08bb 100644
--- a/modules/unistr/u32-move
+++ b/modules/unistr/u32-move
@@ -10,9 +10,9 @@ unistr/base
 memmove
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-move])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-move.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-next b/modules/unistr/u32-next
index c45e941..462fa94 100644
--- a/modules/unistr/u32-next
+++ b/modules/unistr/u32-next
@@ -9,9 +9,9 @@ unistr/base
 unistr/u32-strmbtouc
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-next])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-next.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-prev b/modules/unistr/u32-prev
index 837e4a2..caa628a 100644
--- a/modules/unistr/u32-prev
+++ b/modules/unistr/u32-prev
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-prev])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-prev.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-set b/modules/unistr/u32-set
index a23cdef..d3bf1a5 100644
--- a/modules/unistr/u32-set
+++ b/modules/unistr/u32-set
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-set])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-set.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-startswith b/modules/unistr/u32-startswith
index 6d3f554..b76aaa2 100644
--- a/modules/unistr/u32-startswith
+++ b/modules/unistr/u32-startswith
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-startswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-startswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-stpcpy b/modules/unistr/u32-stpcpy
index 96fe2a2..63cb734 100644
--- a/modules/unistr/u32-stpcpy
+++ b/modules/unistr/u32-stpcpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-stpcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-stpcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-stpncpy b/modules/unistr/u32-stpncpy
index 0fc4f0c..030a5ee 100644
--- a/modules/unistr/u32-stpncpy
+++ b/modules/unistr/u32-stpncpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-stpncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-stpncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strcat b/modules/unistr/u32-strcat
index 0ca908a..e56a72d 100644
--- a/modules/unistr/u32-strcat
+++ b/modules/unistr/u32-strcat
@@ -10,9 +10,9 @@ unistr/base
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strcat])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strcat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strchr b/modules/unistr/u32-strchr
index 01f0580..6448505 100644
--- a/modules/unistr/u32-strchr
+++ b/modules/unistr/u32-strchr
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strcmp b/modules/unistr/u32-strcmp
index e3c7825..f120e26 100644
--- a/modules/unistr/u32-strcmp
+++ b/modules/unistr/u32-strcmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strcmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strcmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strcoll b/modules/unistr/u32-strcoll
index 03904ef..f2e607e 100644
--- a/modules/unistr/u32-strcoll
+++ b/modules/unistr/u32-strcoll
@@ -11,9 +11,9 @@ unistr/u32-strcmp
 uniconv/u32-strconv-to-locale
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strcoll])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strcoll.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strcpy b/modules/unistr/u32-strcpy
index 63d56b4..8aff1f8 100644
--- a/modules/unistr/u32-strcpy
+++ b/modules/unistr/u32-strcpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strcspn b/modules/unistr/u32-strcspn
index e1a3ba2..4275a38 100644
--- a/modules/unistr/u32-strcspn
+++ b/modules/unistr/u32-strcspn
@@ -10,9 +10,9 @@ unistr/u32-strlen
 unistr/u32-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strcspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strcspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strdup b/modules/unistr/u32-strdup
index 2a59d25..cfd9074 100644
--- a/modules/unistr/u32-strdup
+++ b/modules/unistr/u32-strdup
@@ -10,9 +10,9 @@ unistr/base
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strdup])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strdup.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strlen b/modules/unistr/u32-strlen
index 2e99f4b..ae031a6 100644
--- a/modules/unistr/u32-strlen
+++ b/modules/unistr/u32-strlen
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strmblen b/modules/unistr/u32-strmblen
index 744af0d..32c0c62 100644
--- a/modules/unistr/u32-strmblen
+++ b/modules/unistr/u32-strmblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strmblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strmblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strmbtouc b/modules/unistr/u32-strmbtouc
index 8fa5475..1eae2ea 100644
--- a/modules/unistr/u32-strmbtouc
+++ b/modules/unistr/u32-strmbtouc
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strmbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strmbtouc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strncat b/modules/unistr/u32-strncat
index 74b9bed..c3adda5 100644
--- a/modules/unistr/u32-strncat
+++ b/modules/unistr/u32-strncat
@@ -10,9 +10,9 @@ unistr/base
 unistr/u32-strlen
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strncat])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strncat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strncmp b/modules/unistr/u32-strncmp
index 036d71e..3f2c2b8 100644
--- a/modules/unistr/u32-strncmp
+++ b/modules/unistr/u32-strncmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strncmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strncmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strncpy b/modules/unistr/u32-strncpy
index 6b62316..bd66faa 100644
--- a/modules/unistr/u32-strncpy
+++ b/modules/unistr/u32-strncpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strnlen b/modules/unistr/u32-strnlen
index 8e72ba9..ea9f08f 100644
--- a/modules/unistr/u32-strnlen
+++ b/modules/unistr/u32-strnlen
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strpbrk b/modules/unistr/u32-strpbrk
index 9aaa96d..fb54340 100644
--- a/modules/unistr/u32-strpbrk
+++ b/modules/unistr/u32-strpbrk
@@ -9,9 +9,9 @@ unistr/base
 unistr/u32-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strpbrk])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strpbrk.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strrchr b/modules/unistr/u32-strrchr
index 4935f03..1803a5c 100644
--- a/modules/unistr/u32-strrchr
+++ b/modules/unistr/u32-strrchr
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strrchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strrchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strspn b/modules/unistr/u32-strspn
index bf0efed..2b434f1 100644
--- a/modules/unistr/u32-strspn
+++ b/modules/unistr/u32-strspn
@@ -9,9 +9,9 @@ unistr/base
 unistr/u32-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strstr b/modules/unistr/u32-strstr
index a24e606..5e2c50b 100644
--- a/modules/unistr/u32-strstr
+++ b/modules/unistr/u32-strstr
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strstr])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strstr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-strtok b/modules/unistr/u32-strtok
index e338fc2..cce2115 100644
--- a/modules/unistr/u32-strtok
+++ b/modules/unistr/u32-strtok
@@ -11,9 +11,9 @@ unistr/u32-strspn
 unistr/u32-strpbrk
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-strtok])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-strtok.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-to-u16 b/modules/unistr/u32-to-u16
index 6840041..7c26f09 100644
--- a/modules/unistr/u32-to-u16
+++ b/modules/unistr/u32-to-u16
@@ -9,9 +9,9 @@ unistr/base
 unistr/u16-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-to-u16])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-to-u16.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-to-u8 b/modules/unistr/u32-to-u8
index a5ace26..1f40d5e 100644
--- a/modules/unistr/u32-to-u8
+++ b/modules/unistr/u32-to-u8
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-to-u8])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-to-u8.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u32-uctomb b/modules/unistr/u32-uctomb
index c81cd36..ea26cb2 100644
--- a/modules/unistr/u32-uctomb
+++ b/modules/unistr/u32-uctomb
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u32-uctomb])
+gl_LIBUNISTRING_LIBOBJ([unistr/u32-uctomb])
 
 Makefile.am:
-lib_SOURCES += unistr/u32-uctomb.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-check b/modules/unistr/u8-check
index cfebaab..acfc16d 100644
--- a/modules/unistr/u8-check
+++ b/modules/unistr/u8-check
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-check])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-check.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-chr b/modules/unistr/u8-chr
index b90dab0..6d98ec7 100644
--- a/modules/unistr/u8-chr
+++ b/modules/unistr/u8-chr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-chr])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-chr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-cmp b/modules/unistr/u8-cmp
index c885cc8..024e15c 100644
--- a/modules/unistr/u8-cmp
+++ b/modules/unistr/u8-cmp
@@ -9,9 +9,9 @@ unistr/base
 memcmp
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-cmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-cmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-cmp2 b/modules/unistr/u8-cmp2
index 9fbbc43..950842e 100644
--- a/modules/unistr/u8-cmp2
+++ b/modules/unistr/u8-cmp2
@@ -11,9 +11,9 @@ unistr/u8-cmp
 minmax
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-cmp2])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-cmp2.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-cpy b/modules/unistr/u8-cpy
index 3e12cd8..6ea4b95 100644
--- a/modules/unistr/u8-cpy
+++ b/modules/unistr/u8-cpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-cpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-cpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-cpy-alloc b/modules/unistr/u8-cpy-alloc
index 735d901..8203f56 100644
--- a/modules/unistr/u8-cpy-alloc
+++ b/modules/unistr/u8-cpy-alloc
@@ -10,9 +10,9 @@ unistr/base
 malloc-posix
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-cpy-alloc])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-cpy-alloc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-endswith b/modules/unistr/u8-endswith
index b6aa809..979d9e3 100644
--- a/modules/unistr/u8-endswith
+++ b/modules/unistr/u8-endswith
@@ -11,9 +11,9 @@ unistr/u8-strlen
 unistr/u8-cmp
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-endswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-endswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-mblen b/modules/unistr/u8-mblen
index d83b88e..14df9de 100644
--- a/modules/unistr/u8-mblen
+++ b/modules/unistr/u8-mblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-mblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-mbsnlen b/modules/unistr/u8-mbsnlen
index eaa6e1f..8e5a788 100644
--- a/modules/unistr/u8-mbsnlen
+++ b/modules/unistr/u8-mbsnlen
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-mbtoucr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-mbsnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbsnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-mbtouc b/modules/unistr/u8-mbtouc
index 460dfd4..2e80baa 100644
--- a/modules/unistr/u8-mbtouc
+++ b/modules/unistr/u8-mbtouc
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-mbtouc])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-mbtouc unistr/u8-mbtouc-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-mbtouc-unsafe b/modules/unistr/u8-mbtouc-unsafe
index 246966e..607ee68 100644
--- a/modules/unistr/u8-mbtouc-unsafe
+++ b/modules/unistr/u8-mbtouc-unsafe
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-mbtouc-unsafe unistr/u8-mbtouc-unsafe-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-mbtoucr b/modules/unistr/u8-mbtoucr
index f5eadc4..4972732 100644
--- a/modules/unistr/u8-mbtoucr
+++ b/modules/unistr/u8-mbtoucr
@@ -9,9 +9,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-mbtoucr])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-mbtoucr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-move b/modules/unistr/u8-move
index 2403236..f8fb88a 100644
--- a/modules/unistr/u8-move
+++ b/modules/unistr/u8-move
@@ -10,9 +10,9 @@ unistr/base
 memmove
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-move])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-move.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-next b/modules/unistr/u8-next
index 783fb44..7551d66 100644
--- a/modules/unistr/u8-next
+++ b/modules/unistr/u8-next
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-strmbtouc
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-next])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-next.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-prev b/modules/unistr/u8-prev
index 372b416..7892abf 100644
--- a/modules/unistr/u8-prev
+++ b/modules/unistr/u8-prev
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-prev])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-prev.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-set b/modules/unistr/u8-set
index d052c22..8b9991e 100644
--- a/modules/unistr/u8-set
+++ b/modules/unistr/u8-set
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-set])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-set.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-startswith b/modules/unistr/u8-startswith
index b0fdab9..582e59c 100644
--- a/modules/unistr/u8-startswith
+++ b/modules/unistr/u8-startswith
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-startswith])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-startswith.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-stpcpy b/modules/unistr/u8-stpcpy
index 635f773..17d9729 100644
--- a/modules/unistr/u8-stpcpy
+++ b/modules/unistr/u8-stpcpy
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 AC_CHECK_FUNCS_ONCE([stpcpy])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-stpcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-stpcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-stpncpy b/modules/unistr/u8-stpncpy
index 3adb54c..99a2b7f 100644
--- a/modules/unistr/u8-stpncpy
+++ b/modules/unistr/u8-stpncpy
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-stpncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-stpncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strcat b/modules/unistr/u8-strcat
index a9faa74..9577c96 100644
--- a/modules/unistr/u8-strcat
+++ b/modules/unistr/u8-strcat
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strcat])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strcat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strchr b/modules/unistr/u8-strchr
index a025b90..dfa3bb5 100644
--- a/modules/unistr/u8-strchr
+++ b/modules/unistr/u8-strchr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strcmp b/modules/unistr/u8-strcmp
index 0524848..6d7092d 100644
--- a/modules/unistr/u8-strcmp
+++ b/modules/unistr/u8-strcmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strcmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strcmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strcoll b/modules/unistr/u8-strcoll
index 385c388..bfdb1c6 100644
--- a/modules/unistr/u8-strcoll
+++ b/modules/unistr/u8-strcoll
@@ -11,9 +11,9 @@ unistr/u8-strcmp
 uniconv/u8-strconv-to-locale
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strcoll])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strcoll.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strcpy b/modules/unistr/u8-strcpy
index def5a59..e88f857 100644
--- a/modules/unistr/u8-strcpy
+++ b/modules/unistr/u8-strcpy
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strcpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strcpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strcspn b/modules/unistr/u8-strcspn
index 95c487b..97db963 100644
--- a/modules/unistr/u8-strcspn
+++ b/modules/unistr/u8-strcspn
@@ -12,9 +12,9 @@ unistr/u8-strmbtouc
 unistr/u8-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strcspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strcspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strdup b/modules/unistr/u8-strdup
index 8ebd429..db7e29d 100644
--- a/modules/unistr/u8-strdup
+++ b/modules/unistr/u8-strdup
@@ -11,9 +11,9 @@ unistr/u8-strlen
 
 configure.ac:
 AC_CHECK_FUNCS_ONCE([strdup])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strdup])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strdup.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strlen b/modules/unistr/u8-strlen
index 52dec55..459df4e 100644
--- a/modules/unistr/u8-strlen
+++ b/modules/unistr/u8-strlen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strmblen b/modules/unistr/u8-strmblen
index 31945fc..8fbe176 100644
--- a/modules/unistr/u8-strmblen
+++ b/modules/unistr/u8-strmblen
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strmblen])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strmblen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strmbtouc b/modules/unistr/u8-strmbtouc
index c62dde4..1bdf057 100644
--- a/modules/unistr/u8-strmbtouc
+++ b/modules/unistr/u8-strmbtouc
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strmbtouc])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strmbtouc.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strncat b/modules/unistr/u8-strncat
index bf4b43a..cfe87a5 100644
--- a/modules/unistr/u8-strncat
+++ b/modules/unistr/u8-strncat
@@ -9,9 +9,9 @@ unistr/base
 strncat
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strncat])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strncat.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strncmp b/modules/unistr/u8-strncmp
index a4bc8d0..b5a0aab 100644
--- a/modules/unistr/u8-strncmp
+++ b/modules/unistr/u8-strncmp
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strncmp])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strncmp.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strncpy b/modules/unistr/u8-strncpy
index 6f18e6a..c32da3a 100644
--- a/modules/unistr/u8-strncpy
+++ b/modules/unistr/u8-strncpy
@@ -8,9 +8,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strncpy])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strncpy.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strnlen b/modules/unistr/u8-strnlen
index d3fa373..05dea01 100644
--- a/modules/unistr/u8-strnlen
+++ b/modules/unistr/u8-strnlen
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strnlen])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strnlen.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strpbrk b/modules/unistr/u8-strpbrk
index ffbdb82..54b3ba3 100644
--- a/modules/unistr/u8-strpbrk
+++ b/modules/unistr/u8-strpbrk
@@ -11,9 +11,9 @@ unistr/u8-strmbtouc
 unistr/u8-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strpbrk])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strpbrk.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strrchr b/modules/unistr/u8-strrchr
index 656b904..496ae88 100644
--- a/modules/unistr/u8-strrchr
+++ b/modules/unistr/u8-strrchr
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strrchr])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strrchr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strspn b/modules/unistr/u8-strspn
index 1912e6b..6d25e12 100644
--- a/modules/unistr/u8-strspn
+++ b/modules/unistr/u8-strspn
@@ -13,9 +13,9 @@ unistr/u8-cmp
 unistr/u8-strchr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strspn])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strspn.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strstr b/modules/unistr/u8-strstr
index ea9c6ce..60fec16 100644
--- a/modules/unistr/u8-strstr
+++ b/modules/unistr/u8-strstr
@@ -9,9 +9,9 @@ Depends-on:
 unistr/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strstr])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strstr.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-strtok b/modules/unistr/u8-strtok
index 77c30bc..875d58f 100644
--- a/modules/unistr/u8-strtok
+++ b/modules/unistr/u8-strtok
@@ -11,9 +11,9 @@ unistr/u8-strspn
 unistr/u8-strpbrk
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-strtok])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-strtok.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-to-u16 b/modules/unistr/u8-to-u16
index d87a811..bdfb35d 100644
--- a/modules/unistr/u8-to-u16
+++ b/modules/unistr/u8-to-u16
@@ -10,9 +10,9 @@ unistr/u8-mbtoucr
 unistr/u16-uctomb
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-to-u16])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-to-u16.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-to-u32 b/modules/unistr/u8-to-u32
index a3d27d9..502b678 100644
--- a/modules/unistr/u8-to-u32
+++ b/modules/unistr/u8-to-u32
@@ -9,9 +9,9 @@ unistr/base
 unistr/u8-mbtoucr
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-to-u32])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-to-u32.c
 
 Include:
 "unistr.h"
diff --git a/modules/unistr/u8-uctomb b/modules/unistr/u8-uctomb
index 9f3ee36..843bd2c 100644
--- a/modules/unistr/u8-uctomb
+++ b/modules/unistr/u8-uctomb
@@ -10,9 +10,9 @@ unistr/base
 
 configure.ac:
 gl_MODULE_INDICATOR([unistr/u8-uctomb])
+gl_LIBUNISTRING_LIBOBJ([unistr/u8-uctomb unistr/u8-uctomb-aux.c])
 
 Makefile.am:
-lib_SOURCES += unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
 
 Include:
 "unistr.h"
-- 
1.6.6.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]