bug-gnulib
[Top][All Lists]
Advanced

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

[PATCH 08/15] unictype: support libunistring-optional


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

* lib/unictype.h: Rename to...
* lib/unictype.in.h: ... this.
* modules/unictype/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/unictype/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{unictype.h => unictype.in.h}                  |    0
 modules/unictype/base                              |    4 +++-
 modules/unictype/bidicategory-byname               |    2 +-
 modules/unictype/bidicategory-name                 |    2 +-
 modules/unictype/bidicategory-of                   |    2 +-
 modules/unictype/bidicategory-test                 |    2 +-
 modules/unictype/block-list                        |    2 +-
 modules/unictype/block-test                        |    2 +-
 modules/unictype/category-C                        |    4 ++--
 modules/unictype/category-Cc                       |    4 ++--
 modules/unictype/category-Cf                       |    4 ++--
 modules/unictype/category-Cn                       |    4 ++--
 modules/unictype/category-Co                       |    4 ++--
 modules/unictype/category-Cs                       |    4 ++--
 modules/unictype/category-L                        |    4 ++--
 modules/unictype/category-Ll                       |    4 ++--
 modules/unictype/category-Lm                       |    4 ++--
 modules/unictype/category-Lo                       |    4 ++--
 modules/unictype/category-Lt                       |    4 ++--
 modules/unictype/category-Lu                       |    4 ++--
 modules/unictype/category-M                        |    4 ++--
 modules/unictype/category-Mc                       |    4 ++--
 modules/unictype/category-Me                       |    4 ++--
 modules/unictype/category-Mn                       |    4 ++--
 modules/unictype/category-N                        |    4 ++--
 modules/unictype/category-Nd                       |    4 ++--
 modules/unictype/category-Nl                       |    4 ++--
 modules/unictype/category-No                       |    4 ++--
 modules/unictype/category-P                        |    4 ++--
 modules/unictype/category-Pc                       |    4 ++--
 modules/unictype/category-Pd                       |    4 ++--
 modules/unictype/category-Pe                       |    4 ++--
 modules/unictype/category-Pf                       |    4 ++--
 modules/unictype/category-Pi                       |    4 ++--
 modules/unictype/category-Po                       |    4 ++--
 modules/unictype/category-Ps                       |    4 ++--
 modules/unictype/category-S                        |    4 ++--
 modules/unictype/category-Sc                       |    4 ++--
 modules/unictype/category-Sk                       |    4 ++--
 modules/unictype/category-Sm                       |    4 ++--
 modules/unictype/category-So                       |    4 ++--
 modules/unictype/category-Z                        |    4 ++--
 modules/unictype/category-Zl                       |    4 ++--
 modules/unictype/category-Zp                       |    4 ++--
 modules/unictype/category-Zs                       |    4 ++--
 modules/unictype/category-and                      |    2 +-
 modules/unictype/category-and-not                  |    2 +-
 modules/unictype/category-byname                   |    2 +-
 modules/unictype/category-name                     |    2 +-
 modules/unictype/category-none                     |    2 +-
 modules/unictype/category-of                       |    2 +-
 modules/unictype/category-or                       |    2 +-
 modules/unictype/category-test                     |    2 +-
 modules/unictype/combining-class                   |    2 +-
 modules/unictype/ctype-alnum                       |    2 +-
 modules/unictype/ctype-alpha                       |    2 +-
 modules/unictype/ctype-blank                       |    2 +-
 modules/unictype/ctype-cntrl                       |    2 +-
 modules/unictype/ctype-digit                       |    2 +-
 modules/unictype/ctype-graph                       |    2 +-
 modules/unictype/ctype-lower                       |    2 +-
 modules/unictype/ctype-print                       |    2 +-
 modules/unictype/ctype-punct                       |    2 +-
 modules/unictype/ctype-space                       |    2 +-
 modules/unictype/ctype-upper                       |    2 +-
 modules/unictype/ctype-xdigit                      |    2 +-
 modules/unictype/decimal-digit                     |    2 +-
 modules/unictype/digit                             |    2 +-
 modules/unictype/mirror                            |    2 +-
 modules/unictype/numeric                           |    2 +-
 modules/unictype/property-alphabetic               |    2 +-
 modules/unictype/property-ascii-hex-digit          |    2 +-
 modules/unictype/property-bidi-arabic-digit        |    2 +-
 .../unictype/property-bidi-arabic-right-to-left    |    2 +-
 modules/unictype/property-bidi-block-separator     |    2 +-
 modules/unictype/property-bidi-boundary-neutral    |    2 +-
 modules/unictype/property-bidi-common-separator    |    2 +-
 modules/unictype/property-bidi-control             |    2 +-
 .../unictype/property-bidi-embedding-or-override   |    2 +-
 modules/unictype/property-bidi-eur-num-separator   |    2 +-
 modules/unictype/property-bidi-eur-num-terminator  |    2 +-
 modules/unictype/property-bidi-european-digit      |    2 +-
 .../unictype/property-bidi-hebrew-right-to-left    |    2 +-
 modules/unictype/property-bidi-left-to-right       |    2 +-
 modules/unictype/property-bidi-non-spacing-mark    |    2 +-
 modules/unictype/property-bidi-other-neutral       |    2 +-
 modules/unictype/property-bidi-pdf                 |    2 +-
 modules/unictype/property-bidi-segment-separator   |    2 +-
 modules/unictype/property-bidi-whitespace          |    2 +-
 modules/unictype/property-byname                   |    4 ++--
 modules/unictype/property-combining                |    2 +-
 modules/unictype/property-composite                |    2 +-
 modules/unictype/property-currency-symbol          |    2 +-
 modules/unictype/property-dash                     |    2 +-
 modules/unictype/property-decimal-digit            |    2 +-
 .../unictype/property-default-ignorable-code-point |    2 +-
 modules/unictype/property-deprecated               |    2 +-
 modules/unictype/property-diacritic                |    2 +-
 modules/unictype/property-extender                 |    2 +-
 modules/unictype/property-format-control           |    2 +-
 modules/unictype/property-grapheme-base            |    2 +-
 modules/unictype/property-grapheme-extend          |    2 +-
 modules/unictype/property-grapheme-link            |    2 +-
 modules/unictype/property-hex-digit                |    2 +-
 modules/unictype/property-hyphen                   |    2 +-
 modules/unictype/property-id-continue              |    2 +-
 modules/unictype/property-id-start                 |    2 +-
 modules/unictype/property-ideographic              |    2 +-
 modules/unictype/property-ids-binary-operator      |    2 +-
 modules/unictype/property-ids-trinary-operator     |    2 +-
 modules/unictype/property-ignorable-control        |    2 +-
 modules/unictype/property-iso-control              |    2 +-
 modules/unictype/property-join-control             |    2 +-
 modules/unictype/property-left-of-pair             |    2 +-
 modules/unictype/property-line-separator           |    2 +-
 modules/unictype/property-logical-order-exception  |    2 +-
 modules/unictype/property-lowercase                |    2 +-
 modules/unictype/property-math                     |    2 +-
 modules/unictype/property-non-break                |    2 +-
 modules/unictype/property-not-a-character          |    2 +-
 modules/unictype/property-numeric                  |    2 +-
 modules/unictype/property-other-alphabetic         |    2 +-
 .../property-other-default-ignorable-code-point    |    2 +-
 modules/unictype/property-other-grapheme-extend    |    2 +-
 modules/unictype/property-other-id-continue        |    2 +-
 modules/unictype/property-other-id-start           |    2 +-
 modules/unictype/property-other-lowercase          |    2 +-
 modules/unictype/property-other-math               |    2 +-
 modules/unictype/property-other-uppercase          |    2 +-
 modules/unictype/property-paired-punctuation       |    2 +-
 modules/unictype/property-paragraph-separator      |    2 +-
 modules/unictype/property-pattern-syntax           |    2 +-
 modules/unictype/property-pattern-white-space      |    2 +-
 modules/unictype/property-private-use              |    2 +-
 modules/unictype/property-punctuation              |    2 +-
 modules/unictype/property-quotation-mark           |    2 +-
 modules/unictype/property-radical                  |    2 +-
 modules/unictype/property-sentence-terminal        |    2 +-
 modules/unictype/property-soft-dotted              |    2 +-
 modules/unictype/property-space                    |    2 +-
 modules/unictype/property-terminal-punctuation     |    2 +-
 modules/unictype/property-test                     |    2 +-
 modules/unictype/property-titlecase                |    2 +-
 modules/unictype/property-unassigned-code-value    |    2 +-
 modules/unictype/property-unified-ideograph        |    2 +-
 modules/unictype/property-uppercase                |    2 +-
 modules/unictype/property-variation-selector       |    2 +-
 modules/unictype/property-white-space              |    2 +-
 modules/unictype/property-xid-continue             |    2 +-
 modules/unictype/property-xid-start                |    2 +-
 modules/unictype/property-zero-width               |    2 +-
 modules/unictype/scripts                           |    4 ++--
 modules/unictype/syntax-c-ident                    |    2 +-
 modules/unictype/syntax-c-whitespace               |    2 +-
 modules/unictype/syntax-java-ident                 |    2 +-
 modules/unictype/syntax-java-whitespace            |    2 +-
 156 files changed, 196 insertions(+), 194 deletions(-)
 rename lib/{unictype.h => unictype.in.h} (100%)

diff --git a/lib/unictype.h b/lib/unictype.in.h
similarity index 100%
rename from lib/unictype.h
rename to lib/unictype.in.h
diff --git a/modules/unictype/base b/modules/unictype/base
index e287698..c6dd582 100644
--- a/modules/unictype/base
+++ b/modules/unictype/base
@@ -2,13 +2,15 @@ Description:
 Base layer for Unicode classification and properties.
 
 Files:
-lib/unictype.h
+lib/unictype.in.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 stdbool
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([unictype])
 
 Makefile.am:
 
diff --git a/modules/unictype/bidicategory-byname 
b/modules/unictype/bidicategory-byname
index 8185a50..5d52a7c 100644
--- a/modules/unictype/bidicategory-byname
+++ b/modules/unictype/bidicategory-byname
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/bidi_byname])
 
 Makefile.am:
-lib_SOURCES += unictype/bidi_byname.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/bidicategory-name 
b/modules/unictype/bidicategory-name
index 49c151a..b8c75e1 100644
--- a/modules/unictype/bidicategory-name
+++ b/modules/unictype/bidicategory-name
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/bidi_name])
 
 Makefile.am:
-lib_SOURCES += unictype/bidi_name.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/bidicategory-of b/modules/unictype/bidicategory-of
index 77bf278..809891b 100644
--- a/modules/unictype/bidicategory-of
+++ b/modules/unictype/bidicategory-of
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/bidi_of])
 
 Makefile.am:
-lib_SOURCES += unictype/bidi_of.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/bidicategory-test 
b/modules/unictype/bidicategory-test
index 6f5a2fd..9715fc5 100644
--- a/modules/unictype/bidicategory-test
+++ b/modules/unictype/bidicategory-test
@@ -9,9 +9,9 @@ unictype/base
 unictype/bidicategory-of
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/bidi_test])
 
 Makefile.am:
-lib_SOURCES += unictype/bidi_test.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/block-list b/modules/unictype/block-list
index 095f71e..42b080e 100644
--- a/modules/unictype/block-list
+++ b/modules/unictype/block-list
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/blocks])
 
 Makefile.am:
-lib_SOURCES += unictype/blocks.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/block-test b/modules/unictype/block-test
index 14f0478..c3f293a 100644
--- a/modules/unictype/block-test
+++ b/modules/unictype/block-test
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/block_test])
 
 Makefile.am:
-lib_SOURCES += unictype/block_test.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-C b/modules/unictype/category-C
index d998683..2105cfa 100644
--- a/modules/unictype/category-C
+++ b/modules/unictype/category-C
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category C.
 
 Files:
-lib/unictype/categ_C.c
+lib/unictype/categ_C
 lib/unictype/categ_C.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_C])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_C.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Cc b/modules/unictype/category-Cc
index a97ee1c..502a7c8 100644
--- a/modules/unictype/category-Cc
+++ b/modules/unictype/category-Cc
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Cc.
 
 Files:
-lib/unictype/categ_Cc.c
+lib/unictype/categ_Cc
 lib/unictype/categ_Cc.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Cc])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Cc.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Cf b/modules/unictype/category-Cf
index b003964..fd662ca 100644
--- a/modules/unictype/category-Cf
+++ b/modules/unictype/category-Cf
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Cf.
 
 Files:
-lib/unictype/categ_Cf.c
+lib/unictype/categ_Cf
 lib/unictype/categ_Cf.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Cf])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Cf.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Cn b/modules/unictype/category-Cn
index 93a65b3..82bb746 100644
--- a/modules/unictype/category-Cn
+++ b/modules/unictype/category-Cn
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Cn.
 
 Files:
-lib/unictype/categ_Cn.c
+lib/unictype/categ_Cn
 lib/unictype/categ_Cn.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Cn])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Cn.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Co b/modules/unictype/category-Co
index 2157696..330a2c3 100644
--- a/modules/unictype/category-Co
+++ b/modules/unictype/category-Co
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Co.
 
 Files:
-lib/unictype/categ_Co.c
+lib/unictype/categ_Co
 lib/unictype/categ_Co.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Co])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Co.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Cs b/modules/unictype/category-Cs
index cc3d32e..8b03227 100644
--- a/modules/unictype/category-Cs
+++ b/modules/unictype/category-Cs
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Cs.
 
 Files:
-lib/unictype/categ_Cs.c
+lib/unictype/categ_Cs
 lib/unictype/categ_Cs.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Cs])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Cs.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-L b/modules/unictype/category-L
index 56a5b57..4f2ddd9 100644
--- a/modules/unictype/category-L
+++ b/modules/unictype/category-L
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category L.
 
 Files:
-lib/unictype/categ_L.c
+lib/unictype/categ_L
 lib/unictype/categ_L.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_L])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_L.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Ll b/modules/unictype/category-Ll
index 4b9e763..da89465 100644
--- a/modules/unictype/category-Ll
+++ b/modules/unictype/category-Ll
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Ll.
 
 Files:
-lib/unictype/categ_Ll.c
+lib/unictype/categ_Ll
 lib/unictype/categ_Ll.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Ll])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Ll.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Lm b/modules/unictype/category-Lm
index 8d3625f..97490a1 100644
--- a/modules/unictype/category-Lm
+++ b/modules/unictype/category-Lm
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Lm.
 
 Files:
-lib/unictype/categ_Lm.c
+lib/unictype/categ_Lm
 lib/unictype/categ_Lm.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Lm])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Lm.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Lo b/modules/unictype/category-Lo
index 8417a10..7f46010 100644
--- a/modules/unictype/category-Lo
+++ b/modules/unictype/category-Lo
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Lo.
 
 Files:
-lib/unictype/categ_Lo.c
+lib/unictype/categ_Lo
 lib/unictype/categ_Lo.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Lo])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Lo.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Lt b/modules/unictype/category-Lt
index 4bbdee9..f47a7b1 100644
--- a/modules/unictype/category-Lt
+++ b/modules/unictype/category-Lt
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Lt.
 
 Files:
-lib/unictype/categ_Lt.c
+lib/unictype/categ_Lt
 lib/unictype/categ_Lt.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Lt])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Lt.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Lu b/modules/unictype/category-Lu
index ffd78da..92d49bd 100644
--- a/modules/unictype/category-Lu
+++ b/modules/unictype/category-Lu
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Lu.
 
 Files:
-lib/unictype/categ_Lu.c
+lib/unictype/categ_Lu
 lib/unictype/categ_Lu.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Lu])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Lu.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-M b/modules/unictype/category-M
index 73ecb14..c53ed09 100644
--- a/modules/unictype/category-M
+++ b/modules/unictype/category-M
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category M.
 
 Files:
-lib/unictype/categ_M.c
+lib/unictype/categ_M
 lib/unictype/categ_M.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_M])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_M.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Mc b/modules/unictype/category-Mc
index a917309..5ebf0f0 100644
--- a/modules/unictype/category-Mc
+++ b/modules/unictype/category-Mc
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Mc.
 
 Files:
-lib/unictype/categ_Mc.c
+lib/unictype/categ_Mc
 lib/unictype/categ_Mc.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Mc])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Mc.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Me b/modules/unictype/category-Me
index f3bdb9a..38b99d3 100644
--- a/modules/unictype/category-Me
+++ b/modules/unictype/category-Me
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Me.
 
 Files:
-lib/unictype/categ_Me.c
+lib/unictype/categ_Me
 lib/unictype/categ_Me.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Me])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Me.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Mn b/modules/unictype/category-Mn
index 567e2f1..a1d2939 100644
--- a/modules/unictype/category-Mn
+++ b/modules/unictype/category-Mn
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Mn.
 
 Files:
-lib/unictype/categ_Mn.c
+lib/unictype/categ_Mn
 lib/unictype/categ_Mn.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Mn])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Mn.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-N b/modules/unictype/category-N
index 48e33e5..d98d3d5 100644
--- a/modules/unictype/category-N
+++ b/modules/unictype/category-N
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category N.
 
 Files:
-lib/unictype/categ_N.c
+lib/unictype/categ_N
 lib/unictype/categ_N.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_N])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_N.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Nd b/modules/unictype/category-Nd
index 5efaa21..344b061 100644
--- a/modules/unictype/category-Nd
+++ b/modules/unictype/category-Nd
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Nd.
 
 Files:
-lib/unictype/categ_Nd.c
+lib/unictype/categ_Nd
 lib/unictype/categ_Nd.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Nd])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Nd.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Nl b/modules/unictype/category-Nl
index e9dd8a2..8bed18c 100644
--- a/modules/unictype/category-Nl
+++ b/modules/unictype/category-Nl
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Nl.
 
 Files:
-lib/unictype/categ_Nl.c
+lib/unictype/categ_Nl
 lib/unictype/categ_Nl.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Nl])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Nl.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-No b/modules/unictype/category-No
index a59a89d..fc4da25 100644
--- a/modules/unictype/category-No
+++ b/modules/unictype/category-No
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category No.
 
 Files:
-lib/unictype/categ_No.c
+lib/unictype/categ_No
 lib/unictype/categ_No.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_No])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_No.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-P b/modules/unictype/category-P
index 608dd79..d281cd1 100644
--- a/modules/unictype/category-P
+++ b/modules/unictype/category-P
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category P.
 
 Files:
-lib/unictype/categ_P.c
+lib/unictype/categ_P
 lib/unictype/categ_P.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_P])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_P.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Pc b/modules/unictype/category-Pc
index 7656bcc..4b38bf3 100644
--- a/modules/unictype/category-Pc
+++ b/modules/unictype/category-Pc
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Pc.
 
 Files:
-lib/unictype/categ_Pc.c
+lib/unictype/categ_Pc
 lib/unictype/categ_Pc.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Pc])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Pc.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Pd b/modules/unictype/category-Pd
index b179d8a..f34b0d4 100644
--- a/modules/unictype/category-Pd
+++ b/modules/unictype/category-Pd
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Pd.
 
 Files:
-lib/unictype/categ_Pd.c
+lib/unictype/categ_Pd
 lib/unictype/categ_Pd.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Pd])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Pd.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Pe b/modules/unictype/category-Pe
index ca3521a..a907d1e 100644
--- a/modules/unictype/category-Pe
+++ b/modules/unictype/category-Pe
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Pe.
 
 Files:
-lib/unictype/categ_Pe.c
+lib/unictype/categ_Pe
 lib/unictype/categ_Pe.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Pe])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Pe.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Pf b/modules/unictype/category-Pf
index d744994..3cfea76 100644
--- a/modules/unictype/category-Pf
+++ b/modules/unictype/category-Pf
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Pf.
 
 Files:
-lib/unictype/categ_Pf.c
+lib/unictype/categ_Pf
 lib/unictype/categ_Pf.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Pf])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Pf.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Pi b/modules/unictype/category-Pi
index b52882a..1b6fd48 100644
--- a/modules/unictype/category-Pi
+++ b/modules/unictype/category-Pi
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Pi.
 
 Files:
-lib/unictype/categ_Pi.c
+lib/unictype/categ_Pi
 lib/unictype/categ_Pi.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Pi])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Pi.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Po b/modules/unictype/category-Po
index 1e0ef65..efb972b 100644
--- a/modules/unictype/category-Po
+++ b/modules/unictype/category-Po
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Po.
 
 Files:
-lib/unictype/categ_Po.c
+lib/unictype/categ_Po
 lib/unictype/categ_Po.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Po])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Po.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Ps b/modules/unictype/category-Ps
index 45957c4..96b54c4 100644
--- a/modules/unictype/category-Ps
+++ b/modules/unictype/category-Ps
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Ps.
 
 Files:
-lib/unictype/categ_Ps.c
+lib/unictype/categ_Ps
 lib/unictype/categ_Ps.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Ps])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Ps.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-S b/modules/unictype/category-S
index 86f589d..7ae629a 100644
--- a/modules/unictype/category-S
+++ b/modules/unictype/category-S
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category S.
 
 Files:
-lib/unictype/categ_S.c
+lib/unictype/categ_S
 lib/unictype/categ_S.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_S])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_S.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Sc b/modules/unictype/category-Sc
index c1f5b33..85f00fd 100644
--- a/modules/unictype/category-Sc
+++ b/modules/unictype/category-Sc
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Sc.
 
 Files:
-lib/unictype/categ_Sc.c
+lib/unictype/categ_Sc
 lib/unictype/categ_Sc.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Sc])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Sc.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Sk b/modules/unictype/category-Sk
index 3b9476e..136ef7c 100644
--- a/modules/unictype/category-Sk
+++ b/modules/unictype/category-Sk
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Sk.
 
 Files:
-lib/unictype/categ_Sk.c
+lib/unictype/categ_Sk
 lib/unictype/categ_Sk.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Sk])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Sk.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Sm b/modules/unictype/category-Sm
index 1c2c4b4..7afe3e6 100644
--- a/modules/unictype/category-Sm
+++ b/modules/unictype/category-Sm
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Sm.
 
 Files:
-lib/unictype/categ_Sm.c
+lib/unictype/categ_Sm
 lib/unictype/categ_Sm.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Sm])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Sm.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-So b/modules/unictype/category-So
index fcc65f3..d3b676f 100644
--- a/modules/unictype/category-So
+++ b/modules/unictype/category-So
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category So.
 
 Files:
-lib/unictype/categ_So.c
+lib/unictype/categ_So
 lib/unictype/categ_So.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_So])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_So.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Z b/modules/unictype/category-Z
index 13475d5..a5179cf 100644
--- a/modules/unictype/category-Z
+++ b/modules/unictype/category-Z
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Z.
 
 Files:
-lib/unictype/categ_Z.c
+lib/unictype/categ_Z
 lib/unictype/categ_Z.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Z])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Z.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Zl b/modules/unictype/category-Zl
index b50bf27..feaddb9 100644
--- a/modules/unictype/category-Zl
+++ b/modules/unictype/category-Zl
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Zl.
 
 Files:
-lib/unictype/categ_Zl.c
+lib/unictype/categ_Zl
 lib/unictype/categ_Zl.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Zl])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Zl.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Zp b/modules/unictype/category-Zp
index 9bf8f75..f2607c8 100644
--- a/modules/unictype/category-Zp
+++ b/modules/unictype/category-Zp
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Zp.
 
 Files:
-lib/unictype/categ_Zp.c
+lib/unictype/categ_Zp
 lib/unictype/categ_Zp.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Zp])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Zp.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-Zs b/modules/unictype/category-Zs
index 19fa622..4b3dbc9 100644
--- a/modules/unictype/category-Zs
+++ b/modules/unictype/category-Zs
@@ -2,16 +2,16 @@ Description:
 Test whether a Unicode character is of general category Zs.
 
 Files:
-lib/unictype/categ_Zs.c
+lib/unictype/categ_Zs
 lib/unictype/categ_Zs.h
 
 Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_Zs])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_Zs.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-and b/modules/unictype/category-and
index 5d0a9b9..f910174 100644
--- a/modules/unictype/category-and
+++ b/modules/unictype/category-and
@@ -10,9 +10,9 @@ unictype/category-none
 unictype/category-test-withtable
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_and])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_and.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-and-not 
b/modules/unictype/category-and-not
index 58925cf..a925882 100644
--- a/modules/unictype/category-and-not
+++ b/modules/unictype/category-and-not
@@ -10,9 +10,9 @@ unictype/category-none
 unictype/category-test-withtable
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_and_not])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_and_not.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-byname b/modules/unictype/category-byname
index bbc5679..1229eab 100644
--- a/modules/unictype/category-byname
+++ b/modules/unictype/category-byname
@@ -46,9 +46,9 @@ unictype/category-Zs
 unictype/category-none
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_byname])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_byname.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-name b/modules/unictype/category-name
index ef0b1d6..1ae7d17 100644
--- a/modules/unictype/category-name
+++ b/modules/unictype/category-name
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_name])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_name.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-none b/modules/unictype/category-none
index 0c76d79..24ffc99 100644
--- a/modules/unictype/category-none
+++ b/modules/unictype/category-none
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_none])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_none.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-of b/modules/unictype/category-of
index bb38bcf..1c4230a 100644
--- a/modules/unictype/category-of
+++ b/modules/unictype/category-of
@@ -11,9 +11,9 @@ unictype/category-none
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_of])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_of.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-or b/modules/unictype/category-or
index 072ab8a..89f4cb0 100644
--- a/modules/unictype/category-or
+++ b/modules/unictype/category-or
@@ -9,9 +9,9 @@ unictype/base
 unictype/category-test-withtable
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_or])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_or.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/category-test b/modules/unictype/category-test
index c811e48..abec86e 100644
--- a/modules/unictype/category-test
+++ b/modules/unictype/category-test
@@ -10,9 +10,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/categ_test])
 
 Makefile.am:
-lib_SOURCES += unictype/categ_test.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/combining-class b/modules/unictype/combining-class
index 1707902..c5db575 100644
--- a/modules/unictype/combining-class
+++ b/modules/unictype/combining-class
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/combining])
 
 Makefile.am:
-lib_SOURCES += unictype/combining.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-alnum b/modules/unictype/ctype-alnum
index be53c43..5b30f5d 100644
--- a/modules/unictype/ctype-alnum
+++ b/modules/unictype/ctype-alnum
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_alnum])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_alnum.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-alpha b/modules/unictype/ctype-alpha
index d96967b..a484b8a 100644
--- a/modules/unictype/ctype-alpha
+++ b/modules/unictype/ctype-alpha
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_alpha])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_alpha.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-blank b/modules/unictype/ctype-blank
index 6a7a78b..59e1037 100644
--- a/modules/unictype/ctype-blank
+++ b/modules/unictype/ctype-blank
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_blank])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_blank.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-cntrl b/modules/unictype/ctype-cntrl
index 4b9a4d3..2cb516c 100644
--- a/modules/unictype/ctype-cntrl
+++ b/modules/unictype/ctype-cntrl
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_cntrl])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_cntrl.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-digit b/modules/unictype/ctype-digit
index cdce1e9..20611f2 100644
--- a/modules/unictype/ctype-digit
+++ b/modules/unictype/ctype-digit
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-graph b/modules/unictype/ctype-graph
index e1171b2..b45cfca 100644
--- a/modules/unictype/ctype-graph
+++ b/modules/unictype/ctype-graph
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_graph])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_graph.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-lower b/modules/unictype/ctype-lower
index e31281d..f79f7c1 100644
--- a/modules/unictype/ctype-lower
+++ b/modules/unictype/ctype-lower
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_lower])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_lower.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-print b/modules/unictype/ctype-print
index 3f3cf6f..3aa84e5 100644
--- a/modules/unictype/ctype-print
+++ b/modules/unictype/ctype-print
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_print])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_print.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-punct b/modules/unictype/ctype-punct
index 9800fc0..f479ae5 100644
--- a/modules/unictype/ctype-punct
+++ b/modules/unictype/ctype-punct
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_punct])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_punct.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-space b/modules/unictype/ctype-space
index e50ab99..c427946 100644
--- a/modules/unictype/ctype-space
+++ b/modules/unictype/ctype-space
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_space])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_space.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-upper b/modules/unictype/ctype-upper
index 7dfd691..b218597 100644
--- a/modules/unictype/ctype-upper
+++ b/modules/unictype/ctype-upper
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_upper])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_upper.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/ctype-xdigit b/modules/unictype/ctype-xdigit
index dac2b4a..49dfc2c 100644
--- a/modules/unictype/ctype-xdigit
+++ b/modules/unictype/ctype-xdigit
@@ -12,9 +12,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/ctype_xdigit])
 
 Makefile.am:
-lib_SOURCES += unictype/ctype_xdigit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/decimal-digit b/modules/unictype/decimal-digit
index 7802f43..510fa1c 100644
--- a/modules/unictype/decimal-digit
+++ b/modules/unictype/decimal-digit
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/decdigit])
 
 Makefile.am:
-lib_SOURCES += unictype/decdigit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/digit b/modules/unictype/digit
index 7c89e5b..0fac0e4 100644
--- a/modules/unictype/digit
+++ b/modules/unictype/digit
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/digit])
 
 Makefile.am:
-lib_SOURCES += unictype/digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/mirror b/modules/unictype/mirror
index 99d2d61..6cd7e47 100644
--- a/modules/unictype/mirror
+++ b/modules/unictype/mirror
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/mirror])
 
 Makefile.am:
-lib_SOURCES += unictype/mirror.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/numeric b/modules/unictype/numeric
index 1a65f07..3503e7b 100644
--- a/modules/unictype/numeric
+++ b/modules/unictype/numeric
@@ -9,9 +9,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/numeric])
 
 Makefile.am:
-lib_SOURCES += unictype/numeric.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-alphabetic 
b/modules/unictype/property-alphabetic
index 784f011..ffe8c8b 100644
--- a/modules/unictype/property-alphabetic
+++ b/modules/unictype/property-alphabetic
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_alphabetic])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_alphabetic.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-ascii-hex-digit 
b/modules/unictype/property-ascii-hex-digit
index 28c124d..f880a72 100644
--- a/modules/unictype/property-ascii-hex-digit
+++ b/modules/unictype/property-ascii-hex-digit
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_ascii_hex_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_ascii_hex_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-arabic-digit 
b/modules/unictype/property-bidi-arabic-digit
index e1d3e28..564afa8 100644
--- a/modules/unictype/property-bidi-arabic-digit
+++ b/modules/unictype/property-bidi-arabic-digit
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_arabic_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_arabic_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-arabic-right-to-left 
b/modules/unictype/property-bidi-arabic-right-to-left
index 15a9fe0..a4cf1e5 100644
--- a/modules/unictype/property-bidi-arabic-right-to-left
+++ b/modules/unictype/property-bidi-arabic-right-to-left
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_arabic_right_to_left])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_arabic_right_to_left.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-block-separator 
b/modules/unictype/property-bidi-block-separator
index 553a3ab..d5f1a8c 100644
--- a/modules/unictype/property-bidi-block-separator
+++ b/modules/unictype/property-bidi-block-separator
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_block_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_block_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-boundary-neutral 
b/modules/unictype/property-bidi-boundary-neutral
index 2e9f98f..9be249b 100644
--- a/modules/unictype/property-bidi-boundary-neutral
+++ b/modules/unictype/property-bidi-boundary-neutral
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_boundary_neutral])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_boundary_neutral.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-common-separator 
b/modules/unictype/property-bidi-common-separator
index 1eb12cc..3fa612f 100644
--- a/modules/unictype/property-bidi-common-separator
+++ b/modules/unictype/property-bidi-common-separator
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_common_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_common_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-control 
b/modules/unictype/property-bidi-control
index 6a86708..36ff192 100644
--- a/modules/unictype/property-bidi-control
+++ b/modules/unictype/property-bidi-control
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_control])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_control.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-embedding-or-override 
b/modules/unictype/property-bidi-embedding-or-override
index a843eb8..c27c362 100644
--- a/modules/unictype/property-bidi-embedding-or-override
+++ b/modules/unictype/property-bidi-embedding-or-override
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_embedding_or_override])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_embedding_or_override.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-eur-num-separator 
b/modules/unictype/property-bidi-eur-num-separator
index 7669653..04db860 100644
--- a/modules/unictype/property-bidi-eur-num-separator
+++ b/modules/unictype/property-bidi-eur-num-separator
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_eur_num_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_eur_num_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-eur-num-terminator 
b/modules/unictype/property-bidi-eur-num-terminator
index 18c3b58..b40c5ad 100644
--- a/modules/unictype/property-bidi-eur-num-terminator
+++ b/modules/unictype/property-bidi-eur-num-terminator
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_eur_num_terminator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_eur_num_terminator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-european-digit 
b/modules/unictype/property-bidi-european-digit
index febb9f9..cc18089 100644
--- a/modules/unictype/property-bidi-european-digit
+++ b/modules/unictype/property-bidi-european-digit
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_european_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_european_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-hebrew-right-to-left 
b/modules/unictype/property-bidi-hebrew-right-to-left
index 933a08a..3ee1a89 100644
--- a/modules/unictype/property-bidi-hebrew-right-to-left
+++ b/modules/unictype/property-bidi-hebrew-right-to-left
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_hebrew_right_to_left])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_hebrew_right_to_left.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-left-to-right 
b/modules/unictype/property-bidi-left-to-right
index 8bc9216..996a721 100644
--- a/modules/unictype/property-bidi-left-to-right
+++ b/modules/unictype/property-bidi-left-to-right
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_left_to_right])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_left_to_right.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-non-spacing-mark 
b/modules/unictype/property-bidi-non-spacing-mark
index 699c3b9..913a5bd 100644
--- a/modules/unictype/property-bidi-non-spacing-mark
+++ b/modules/unictype/property-bidi-non-spacing-mark
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_non_spacing_mark])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_non_spacing_mark.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-other-neutral 
b/modules/unictype/property-bidi-other-neutral
index b1a7c4a..6421261 100644
--- a/modules/unictype/property-bidi-other-neutral
+++ b/modules/unictype/property-bidi-other-neutral
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_other_neutral])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_other_neutral.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-pdf 
b/modules/unictype/property-bidi-pdf
index 20d7e8f..b31c7f9 100644
--- a/modules/unictype/property-bidi-pdf
+++ b/modules/unictype/property-bidi-pdf
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_pdf])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_pdf.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-segment-separator 
b/modules/unictype/property-bidi-segment-separator
index 18c7713..2f433bb 100644
--- a/modules/unictype/property-bidi-segment-separator
+++ b/modules/unictype/property-bidi-segment-separator
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_segment_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_segment_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-bidi-whitespace 
b/modules/unictype/property-bidi-whitespace
index ed83375..6232fdb 100644
--- a/modules/unictype/property-bidi-whitespace
+++ b/modules/unictype/property-bidi-whitespace
@@ -12,9 +12,9 @@ unictype/bidicategory-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_bidi_whitespace])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_bidi_whitespace.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-byname b/modules/unictype/property-byname
index b50911b..57ae305 100644
--- a/modules/unictype/property-byname
+++ b/modules/unictype/property-byname
@@ -3,7 +3,7 @@ Find a Unicode character property, given its name.
 
 Files:
 lib/unictype/pr_byname.c
-lib/unictype/pr_byname.gperf
+lib/unictype/pr_byname.gperf.c
 
 Depends-on:
 unictype/base
@@ -89,9 +89,9 @@ unictype/property-zero-width
 gperf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_byname])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_byname.c
 
 unictype/pr_byname.h: unictype/pr_byname.gperf
        $(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > 
$(srcdir)/unictype/pr_byname.h-t
diff --git a/modules/unictype/property-combining 
b/modules/unictype/property-combining
index dd9706d..8373ee5 100644
--- a/modules/unictype/property-combining
+++ b/modules/unictype/property-combining
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_combining])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_combining.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-composite 
b/modules/unictype/property-composite
index d7ec5ec..6ac1af0 100644
--- a/modules/unictype/property-composite
+++ b/modules/unictype/property-composite
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_composite])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_composite.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-currency-symbol 
b/modules/unictype/property-currency-symbol
index 7c8bc9c..2ff8759 100644
--- a/modules/unictype/property-currency-symbol
+++ b/modules/unictype/property-currency-symbol
@@ -13,9 +13,9 @@ unictype/category-Sc
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_currency_symbol])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_currency_symbol.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-dash b/modules/unictype/property-dash
index 94a1d70..ccd75e3 100644
--- a/modules/unictype/property-dash
+++ b/modules/unictype/property-dash
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_dash])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_dash.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-decimal-digit 
b/modules/unictype/property-decimal-digit
index 16e390e..316e282 100644
--- a/modules/unictype/property-decimal-digit
+++ b/modules/unictype/property-decimal-digit
@@ -13,9 +13,9 @@ unictype/category-Nd
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_decimal_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_decimal_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-default-ignorable-code-point 
b/modules/unictype/property-default-ignorable-code-point
index 9050a66..e729f5b 100644
--- a/modules/unictype/property-default-ignorable-code-point
+++ b/modules/unictype/property-default-ignorable-code-point
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_default_ignorable_code_point])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_default_ignorable_code_point.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-deprecated 
b/modules/unictype/property-deprecated
index 7e5d60b..5dc0cc1 100644
--- a/modules/unictype/property-deprecated
+++ b/modules/unictype/property-deprecated
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_deprecated])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_deprecated.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-diacritic 
b/modules/unictype/property-diacritic
index 09df4b6..a50f62e 100644
--- a/modules/unictype/property-diacritic
+++ b/modules/unictype/property-diacritic
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_diacritic])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_diacritic.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-extender 
b/modules/unictype/property-extender
index bb3ae1d..4ec8bc5 100644
--- a/modules/unictype/property-extender
+++ b/modules/unictype/property-extender
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_extender])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_extender.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-format-control 
b/modules/unictype/property-format-control
index 250b35d..eb10e27 100644
--- a/modules/unictype/property-format-control
+++ b/modules/unictype/property-format-control
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_format_control])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_format_control.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-grapheme-base 
b/modules/unictype/property-grapheme-base
index 6576e45..6b78a61 100644
--- a/modules/unictype/property-grapheme-base
+++ b/modules/unictype/property-grapheme-base
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_grapheme_base])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_grapheme_base.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-grapheme-extend 
b/modules/unictype/property-grapheme-extend
index b759a4d..6b4f168 100644
--- a/modules/unictype/property-grapheme-extend
+++ b/modules/unictype/property-grapheme-extend
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_grapheme_extend])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_grapheme_extend.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-grapheme-link 
b/modules/unictype/property-grapheme-link
index 29fe576..971d5e5 100644
--- a/modules/unictype/property-grapheme-link
+++ b/modules/unictype/property-grapheme-link
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_grapheme_link])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_grapheme_link.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-hex-digit 
b/modules/unictype/property-hex-digit
index 01f2502..c827e21 100644
--- a/modules/unictype/property-hex-digit
+++ b/modules/unictype/property-hex-digit
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_hex_digit])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_hex_digit.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-hyphen b/modules/unictype/property-hyphen
index fc55b58..bed6e4b 100644
--- a/modules/unictype/property-hyphen
+++ b/modules/unictype/property-hyphen
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_hyphen])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_hyphen.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-id-continue 
b/modules/unictype/property-id-continue
index 9d4092e..fe1234f 100644
--- a/modules/unictype/property-id-continue
+++ b/modules/unictype/property-id-continue
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_id_continue])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_id_continue.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-id-start 
b/modules/unictype/property-id-start
index 49cb595..fddfcff 100644
--- a/modules/unictype/property-id-start
+++ b/modules/unictype/property-id-start
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_id_start])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_id_start.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-ideographic 
b/modules/unictype/property-ideographic
index 4400127..eedad53 100644
--- a/modules/unictype/property-ideographic
+++ b/modules/unictype/property-ideographic
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_ideographic])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_ideographic.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-ids-binary-operator 
b/modules/unictype/property-ids-binary-operator
index 2accc75..ad3543e 100644
--- a/modules/unictype/property-ids-binary-operator
+++ b/modules/unictype/property-ids-binary-operator
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_ids_binary_operator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_ids_binary_operator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-ids-trinary-operator 
b/modules/unictype/property-ids-trinary-operator
index 46d01f9..4ace982 100644
--- a/modules/unictype/property-ids-trinary-operator
+++ b/modules/unictype/property-ids-trinary-operator
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_ids_trinary_operator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_ids_trinary_operator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-ignorable-control 
b/modules/unictype/property-ignorable-control
index c8e17df..41e5cdf 100644
--- a/modules/unictype/property-ignorable-control
+++ b/modules/unictype/property-ignorable-control
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_ignorable_control])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_ignorable_control.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-iso-control 
b/modules/unictype/property-iso-control
index 596f18d..b3b79da 100644
--- a/modules/unictype/property-iso-control
+++ b/modules/unictype/property-iso-control
@@ -13,9 +13,9 @@ unictype/category-Cc
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_iso_control])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_iso_control.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-join-control 
b/modules/unictype/property-join-control
index ba2241a..6df6363 100644
--- a/modules/unictype/property-join-control
+++ b/modules/unictype/property-join-control
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_join_control])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_join_control.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-left-of-pair 
b/modules/unictype/property-left-of-pair
index f831094..a8a1d55 100644
--- a/modules/unictype/property-left-of-pair
+++ b/modules/unictype/property-left-of-pair
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_left_of_pair])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_left_of_pair.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-line-separator 
b/modules/unictype/property-line-separator
index 6a8e3e9..4cf9cb6 100644
--- a/modules/unictype/property-line-separator
+++ b/modules/unictype/property-line-separator
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_line_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_line_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-logical-order-exception 
b/modules/unictype/property-logical-order-exception
index b84ffd1..39868fc 100644
--- a/modules/unictype/property-logical-order-exception
+++ b/modules/unictype/property-logical-order-exception
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_logical_order_exception])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_logical_order_exception.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-lowercase 
b/modules/unictype/property-lowercase
index 90073a1..ce15dd3 100644
--- a/modules/unictype/property-lowercase
+++ b/modules/unictype/property-lowercase
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_lowercase])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_lowercase.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-math b/modules/unictype/property-math
index e2d9d39..5cfc6b5 100644
--- a/modules/unictype/property-math
+++ b/modules/unictype/property-math
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_math])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_math.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-non-break 
b/modules/unictype/property-non-break
index 2a4835d..7bb7997 100644
--- a/modules/unictype/property-non-break
+++ b/modules/unictype/property-non-break
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_non_break])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_non_break.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-not-a-character 
b/modules/unictype/property-not-a-character
index 3b7fa7d..b550c43 100644
--- a/modules/unictype/property-not-a-character
+++ b/modules/unictype/property-not-a-character
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_not_a_character])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_not_a_character.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-numeric 
b/modules/unictype/property-numeric
index 0bd6da1..f9f608e 100644
--- a/modules/unictype/property-numeric
+++ b/modules/unictype/property-numeric
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_numeric])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_numeric.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-alphabetic 
b/modules/unictype/property-other-alphabetic
index 40db74d..6813f83 100644
--- a/modules/unictype/property-other-alphabetic
+++ b/modules/unictype/property-other-alphabetic
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_alphabetic])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_alphabetic.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-default-ignorable-code-point 
b/modules/unictype/property-other-default-ignorable-code-point
index 5abe6b8..e955397 100644
--- a/modules/unictype/property-other-default-ignorable-code-point
+++ b/modules/unictype/property-other-default-ignorable-code-point
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_default_ignorable_code_point])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_default_ignorable_code_point.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-grapheme-extend 
b/modules/unictype/property-other-grapheme-extend
index 3408a2d..1206957 100644
--- a/modules/unictype/property-other-grapheme-extend
+++ b/modules/unictype/property-other-grapheme-extend
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_grapheme_extend])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_grapheme_extend.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-id-continue 
b/modules/unictype/property-other-id-continue
index f920431..e1b4ad2 100644
--- a/modules/unictype/property-other-id-continue
+++ b/modules/unictype/property-other-id-continue
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_id_continue])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_id_continue.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-id-start 
b/modules/unictype/property-other-id-start
index 627da3a..88b59ec 100644
--- a/modules/unictype/property-other-id-start
+++ b/modules/unictype/property-other-id-start
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_id_start])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_id_start.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-lowercase 
b/modules/unictype/property-other-lowercase
index d416b44..eb9dcd5 100644
--- a/modules/unictype/property-other-lowercase
+++ b/modules/unictype/property-other-lowercase
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_lowercase])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_lowercase.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-math 
b/modules/unictype/property-other-math
index 3ef531e..07e58c6 100644
--- a/modules/unictype/property-other-math
+++ b/modules/unictype/property-other-math
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_math])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_math.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-other-uppercase 
b/modules/unictype/property-other-uppercase
index 81cd907..c6917bb 100644
--- a/modules/unictype/property-other-uppercase
+++ b/modules/unictype/property-other-uppercase
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_other_uppercase])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_other_uppercase.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-paired-punctuation 
b/modules/unictype/property-paired-punctuation
index c863fee..e2fdcb9 100644
--- a/modules/unictype/property-paired-punctuation
+++ b/modules/unictype/property-paired-punctuation
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_paired_punctuation])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_paired_punctuation.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-paragraph-separator 
b/modules/unictype/property-paragraph-separator
index 0415746..41fad12 100644
--- a/modules/unictype/property-paragraph-separator
+++ b/modules/unictype/property-paragraph-separator
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_paragraph_separator])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_paragraph_separator.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-pattern-syntax 
b/modules/unictype/property-pattern-syntax
index e184dad..6f5415d 100644
--- a/modules/unictype/property-pattern-syntax
+++ b/modules/unictype/property-pattern-syntax
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_pattern_syntax])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_pattern_syntax.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-pattern-white-space 
b/modules/unictype/property-pattern-white-space
index 26f3c1a..9e081cb 100644
--- a/modules/unictype/property-pattern-white-space
+++ b/modules/unictype/property-pattern-white-space
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_pattern_white_space])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_pattern_white_space.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-private-use 
b/modules/unictype/property-private-use
index dd9c3fd..d9ac5e1 100644
--- a/modules/unictype/property-private-use
+++ b/modules/unictype/property-private-use
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_private_use])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_private_use.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-punctuation 
b/modules/unictype/property-punctuation
index 33890d1..34893bb 100644
--- a/modules/unictype/property-punctuation
+++ b/modules/unictype/property-punctuation
@@ -13,9 +13,9 @@ unictype/category-P
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_punctuation])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_punctuation.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-quotation-mark 
b/modules/unictype/property-quotation-mark
index 511c133..5cd98f8 100644
--- a/modules/unictype/property-quotation-mark
+++ b/modules/unictype/property-quotation-mark
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_quotation_mark])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_quotation_mark.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-radical 
b/modules/unictype/property-radical
index 5b8eb1b..560d931 100644
--- a/modules/unictype/property-radical
+++ b/modules/unictype/property-radical
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_radical])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_radical.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-sentence-terminal 
b/modules/unictype/property-sentence-terminal
index 16dc1cb..e5ad42e 100644
--- a/modules/unictype/property-sentence-terminal
+++ b/modules/unictype/property-sentence-terminal
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_sentence_terminal])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_sentence_terminal.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-soft-dotted 
b/modules/unictype/property-soft-dotted
index 41f1018..7513f11 100644
--- a/modules/unictype/property-soft-dotted
+++ b/modules/unictype/property-soft-dotted
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_soft_dotted])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_soft_dotted.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-space b/modules/unictype/property-space
index d6a8345..785a893 100644
--- a/modules/unictype/property-space
+++ b/modules/unictype/property-space
@@ -13,9 +13,9 @@ unictype/category-Zs
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_space])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_space.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-terminal-punctuation 
b/modules/unictype/property-terminal-punctuation
index 9d76602..23cdcb9 100644
--- a/modules/unictype/property-terminal-punctuation
+++ b/modules/unictype/property-terminal-punctuation
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_terminal_punctuation])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_terminal_punctuation.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-test b/modules/unictype/property-test
index 385c082..d09e1e3 100644
--- a/modules/unictype/property-test
+++ b/modules/unictype/property-test
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_test])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_test.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-titlecase 
b/modules/unictype/property-titlecase
index 793d6c3..93a1c40 100644
--- a/modules/unictype/property-titlecase
+++ b/modules/unictype/property-titlecase
@@ -13,9 +13,9 @@ unictype/category-Lt
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_titlecase])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_titlecase.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-unassigned-code-value 
b/modules/unictype/property-unassigned-code-value
index fb63d9b..a8bdb80 100644
--- a/modules/unictype/property-unassigned-code-value
+++ b/modules/unictype/property-unassigned-code-value
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_unassigned_code_value])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_unassigned_code_value.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-unified-ideograph 
b/modules/unictype/property-unified-ideograph
index 700b2e6..a4c26f7 100644
--- a/modules/unictype/property-unified-ideograph
+++ b/modules/unictype/property-unified-ideograph
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_unified_ideograph])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_unified_ideograph.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-uppercase 
b/modules/unictype/property-uppercase
index f645f81..e60ef29 100644
--- a/modules/unictype/property-uppercase
+++ b/modules/unictype/property-uppercase
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_uppercase])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_uppercase.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-variation-selector 
b/modules/unictype/property-variation-selector
index 4fc42e5..6aeb1f8 100644
--- a/modules/unictype/property-variation-selector
+++ b/modules/unictype/property-variation-selector
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_variation_selector])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_variation_selector.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-white-space 
b/modules/unictype/property-white-space
index decb286..3e432b8 100644
--- a/modules/unictype/property-white-space
+++ b/modules/unictype/property-white-space
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_white_space])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_white_space.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-xid-continue 
b/modules/unictype/property-xid-continue
index 6480d92..62073fd 100644
--- a/modules/unictype/property-xid-continue
+++ b/modules/unictype/property-xid-continue
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_xid_continue])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_xid_continue.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-xid-start 
b/modules/unictype/property-xid-start
index 8008a9f..98a5f65 100644
--- a/modules/unictype/property-xid-start
+++ b/modules/unictype/property-xid-start
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_xid_start])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_xid_start.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/property-zero-width 
b/modules/unictype/property-zero-width
index 759ff4e..d77e096 100644
--- a/modules/unictype/property-zero-width
+++ b/modules/unictype/property-zero-width
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/pr_zero_width])
 
 Makefile.am:
-lib_SOURCES += unictype/pr_zero_width.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/scripts b/modules/unictype/scripts
index 6d5c71b..49e54a6 100644
--- a/modules/unictype/scripts
+++ b/modules/unictype/scripts
@@ -4,16 +4,16 @@ Scripts of Unicode characters.
 Files:
 lib/unictype/scripts.c
 lib/unictype/scripts.h
-lib/unictype/scripts_byname.gperf
+lib/unictype/scripts_byname.gperf.c
 
 Depends-on:
 unictype/base
 gperf
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/scripts])
 
 Makefile.am:
-lib_SOURCES += unictype/scripts.c
 
 unictype/scripts_byname.h: unictype/scripts_byname.gperf
        $(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > 
$(srcdir)/unictype/scripts_byname.h-t
diff --git a/modules/unictype/syntax-c-ident b/modules/unictype/syntax-c-ident
index 2106569..bef489c 100644
--- a/modules/unictype/syntax-c-ident
+++ b/modules/unictype/syntax-c-ident
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/sy_c_ident])
 
 Makefile.am:
-lib_SOURCES += unictype/sy_c_ident.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/syntax-c-whitespace 
b/modules/unictype/syntax-c-whitespace
index 8c5be57..ea2e066 100644
--- a/modules/unictype/syntax-c-whitespace
+++ b/modules/unictype/syntax-c-whitespace
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/sy_c_whitespace])
 
 Makefile.am:
-lib_SOURCES += unictype/sy_c_whitespace.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/syntax-java-ident 
b/modules/unictype/syntax-java-ident
index 220b11d..39cfc9f 100644
--- a/modules/unictype/syntax-java-ident
+++ b/modules/unictype/syntax-java-ident
@@ -11,9 +11,9 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unictype/sy_java_ident])
 
 Makefile.am:
-lib_SOURCES += unictype/sy_java_ident.c
 
 Include:
 "unictype.h"
diff --git a/modules/unictype/syntax-java-whitespace 
b/modules/unictype/syntax-java-whitespace
index 85b0c5b..01a0a69 100644
--- a/modules/unictype/syntax-java-whitespace
+++ b/modules/unictype/syntax-java-whitespace
@@ -8,9 +8,9 @@ Depends-on:
 unictype/base
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unictype/sy_java_whitespace])
 
 Makefile.am:
-lib_SOURCES += unictype/sy_java_whitespace.c
 
 Include:
 "unictype.h"
-- 
1.6.6.1






reply via email to

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