* lib/uniwbrk.h: Rename to...
* lib/uniwbrk.in.h: ... this.
* modules/uniwbrk/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/uniwbrk/*: Use gl_LIBUNISTRING_LIBOBJ.
---
lib/{uniwbrk.h => uniwbrk.in.h} | 0
modules/uniwbrk/base | 4 +++-
modules/uniwbrk/table | 2 +-
modules/uniwbrk/u16-wordbreaks | 2 +-
modules/uniwbrk/u32-wordbreaks | 2 +-
modules/uniwbrk/u8-wordbreaks | 2 +-
modules/uniwbrk/ulc-wordbreaks | 2 +-
modules/uniwbrk/wordbreak-property | 2 +-
8 files changed, 9 insertions(+), 7 deletions(-)
rename lib/{uniwbrk.h => uniwbrk.in.h} (100%)
diff --git a/lib/uniwbrk.h b/lib/uniwbrk.in.h
similarity index 100%
rename from lib/uniwbrk.h
rename to lib/uniwbrk.in.h
diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base
index 66afadb..126de32 100644
--- a/modules/uniwbrk/base
+++ b/modules/uniwbrk/base
@@ -2,12 +2,14 @@ Description:
Base layer for word breaks.
Files:
-lib/uniwbrk.h
+lib/uniwbrk.in.h
+m4/libunistring-optional.m4
Depends-on:
unitypes
configure.ac:
+gl_LIBUNISTRING_HEADER([uniwbrk])
Makefile.am:
diff --git a/modules/uniwbrk/table b/modules/uniwbrk/table
index 99392db..f86436a 100644
--- a/modules/uniwbrk/table
+++ b/modules/uniwbrk/table
@@ -7,9 +7,9 @@ lib/uniwbrk/wbrktable.c
Depends-on:
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/wbrktable])
Makefile.am:
-lib_SOURCES += uniwbrk/wbrktable.c
Include:
"uniwbrk/wbrktable.h"
diff --git a/modules/uniwbrk/u16-wordbreaks b/modules/uniwbrk/u16-wordbreaks
index 8bf71f8..7363d10 100644
--- a/modules/uniwbrk/u16-wordbreaks
+++ b/modules/uniwbrk/u16-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
unistr/u16-mbtouc-unsafe
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/u16-wordbreaks])
Makefile.am:
-lib_SOURCES += uniwbrk/u16-wordbreaks.c
Include:
"uniwbrk.h"
diff --git a/modules/uniwbrk/u32-wordbreaks b/modules/uniwbrk/u32-wordbreaks
index a290aa3..8e3fda6 100644
--- a/modules/uniwbrk/u32-wordbreaks
+++ b/modules/uniwbrk/u32-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
unistr/u32-mbtouc-unsafe
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/u32-wordbreaks])
Makefile.am:
-lib_SOURCES += uniwbrk/u32-wordbreaks.c
Include:
"uniwbrk.h"
diff --git a/modules/uniwbrk/u8-wordbreaks b/modules/uniwbrk/u8-wordbreaks
index 46d1fd1..1fdac4c 100644
--- a/modules/uniwbrk/u8-wordbreaks
+++ b/modules/uniwbrk/u8-wordbreaks
@@ -12,9 +12,9 @@ uniwbrk/table
unistr/u8-mbtouc-unsafe
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/u8-wordbreaks])
Makefile.am:
-lib_SOURCES += uniwbrk/u8-wordbreaks.c
Include:
"uniwbrk.h"
diff --git a/modules/uniwbrk/ulc-wordbreaks b/modules/uniwbrk/ulc-wordbreaks
index 5250751..48b900d 100644
--- a/modules/uniwbrk/ulc-wordbreaks
+++ b/modules/uniwbrk/ulc-wordbreaks
@@ -13,9 +13,9 @@ c-ctype
localcharset
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/ulc-wordbreaks])
Makefile.am:
-lib_SOURCES += uniwbrk/ulc-wordbreaks.c
Include:
"uniwbrk.h"
diff --git a/modules/uniwbrk/wordbreak-property
b/modules/uniwbrk/wordbreak-property
index 34462ad..cfd42f2 100644
--- a/modules/uniwbrk/wordbreak-property
+++ b/modules/uniwbrk/wordbreak-property
@@ -9,9 +9,9 @@ Depends-on:
uniwbrk/base
configure.ac:
+gl_LIBUNISTRING_LIBOBJ([uniwbrk/wordbreak-property])
Makefile.am:
-lib_SOURCES += uniwbrk/wordbreak-property.c
Include:
"uniwbrk.h"
--
1.6.6.1
