bug-gnulib
[Top][All Lists]
Advanced

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

[PATCH 09/15] unilbrk: support libunistring-optional


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

* lib/unilbrk.h: Rename to...
* lib/unilbrk.in.h: ... this.
* modules/unilbrk/base: Adjust, use gl_LIBUNISTRING_HEADER.
* modules/unilbrk/*: Use gl_LIBUNISTRING_LIBOBJ.
---
 lib/{unilbrk.h => unilbrk.in.h}         |    0
 modules/unilbrk/base                    |    4 +++-
 modules/unilbrk/tables                  |    2 +-
 modules/unilbrk/u16-possible-linebreaks |    2 +-
 modules/unilbrk/u16-width-linebreaks    |    2 +-
 modules/unilbrk/u32-possible-linebreaks |    2 +-
 modules/unilbrk/u32-width-linebreaks    |    2 +-
 modules/unilbrk/u8-possible-linebreaks  |    2 +-
 modules/unilbrk/u8-width-linebreaks     |    2 +-
 modules/unilbrk/ulc-common              |    2 +-
 modules/unilbrk/ulc-possible-linebreaks |    2 +-
 modules/unilbrk/ulc-width-linebreaks    |    2 +-
 12 files changed, 13 insertions(+), 11 deletions(-)
 rename lib/{unilbrk.h => unilbrk.in.h} (100%)

diff --git a/lib/unilbrk.h b/lib/unilbrk.in.h
similarity index 100%
rename from lib/unilbrk.h
rename to lib/unilbrk.in.h
diff --git a/modules/unilbrk/base b/modules/unilbrk/base
index 988aaae..62a6b7a 100644
--- a/modules/unilbrk/base
+++ b/modules/unilbrk/base
@@ -2,13 +2,15 @@ Description:
 Base layer for line breaking.
 
 Files:
-lib/unilbrk.h
+lib/unilbrk.in.h
+m4/libunistring-optional.m4
 
 Depends-on:
 unitypes
 localcharset
 
 configure.ac:
+gl_LIBUNISTRING_HEADER([unilbrk])
 
 Makefile.am:
 
diff --git a/modules/unilbrk/tables b/modules/unilbrk/tables
index 5e4c1e8..8e1d612 100644
--- a/modules/unilbrk/tables
+++ b/modules/unilbrk/tables
@@ -12,9 +12,9 @@ unilbrk/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_LIBOBJ([unilbrk/lbrktables])
 
 Makefile.am:
-lib_SOURCES += unilbrk/lbrktables.c
 
 Include:
 "unilbrk/lbrktables.h"
diff --git a/modules/unilbrk/u16-possible-linebreaks 
b/modules/unilbrk/u16-possible-linebreaks
index 5f79aa5..0338fac 100644
--- a/modules/unilbrk/u16-possible-linebreaks
+++ b/modules/unilbrk/u16-possible-linebreaks
@@ -12,9 +12,9 @@ unistr/u16-mbtouc-unsafe
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u16-possible-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u16-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u16-width-linebreaks 
b/modules/unilbrk/u16-width-linebreaks
index 6f6db88..97cbef1 100644
--- a/modules/unilbrk/u16-width-linebreaks
+++ b/modules/unilbrk/u16-width-linebreaks
@@ -11,9 +11,9 @@ uniwidth/width
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u16-width-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u16-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u32-possible-linebreaks 
b/modules/unilbrk/u32-possible-linebreaks
index eda9518..40a1c86 100644
--- a/modules/unilbrk/u32-possible-linebreaks
+++ b/modules/unilbrk/u32-possible-linebreaks
@@ -11,9 +11,9 @@ unilbrk/tables
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u32-possible-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u32-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u32-width-linebreaks 
b/modules/unilbrk/u32-width-linebreaks
index e69f298..1c0bea8 100644
--- a/modules/unilbrk/u32-width-linebreaks
+++ b/modules/unilbrk/u32-width-linebreaks
@@ -10,9 +10,9 @@ unilbrk/u32-possible-linebreaks
 uniwidth/width
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u32-width-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u32-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u8-possible-linebreaks 
b/modules/unilbrk/u8-possible-linebreaks
index 6bd41ae..68ed524 100644
--- a/modules/unilbrk/u8-possible-linebreaks
+++ b/modules/unilbrk/u8-possible-linebreaks
@@ -12,9 +12,9 @@ unistr/u8-mbtouc-unsafe
 streq
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u8-possible-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u8-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/u8-width-linebreaks 
b/modules/unilbrk/u8-width-linebreaks
index 83a2e25..cd29085 100644
--- a/modules/unilbrk/u8-width-linebreaks
+++ b/modules/unilbrk/u8-width-linebreaks
@@ -11,9 +11,9 @@ uniwidth/width
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/u8-width-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/u8-width-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/ulc-common b/modules/unilbrk/ulc-common
index f7e6242..0262c01 100644
--- a/modules/unilbrk/ulc-common
+++ b/modules/unilbrk/ulc-common
@@ -10,9 +10,9 @@ c-ctype
 c-strcaseeq
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/ulc-common])
 
 Makefile.am:
-lib_SOURCES += unilbrk/ulc-common.c
 
 Include:
 "unilbrk/ulc-common.h"
diff --git a/modules/unilbrk/ulc-possible-linebreaks 
b/modules/unilbrk/ulc-possible-linebreaks
index f7cc283..7d22b09 100644
--- a/modules/unilbrk/ulc-possible-linebreaks
+++ b/modules/unilbrk/ulc-possible-linebreaks
@@ -12,9 +12,9 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/ulc-possible-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/ulc-possible-linebreaks.c
 
 Include:
 "unilbrk.h"
diff --git a/modules/unilbrk/ulc-width-linebreaks 
b/modules/unilbrk/ulc-width-linebreaks
index 5763e85..9c870f3 100644
--- a/modules/unilbrk/ulc-width-linebreaks
+++ b/modules/unilbrk/ulc-width-linebreaks
@@ -12,9 +12,9 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
+gl_LIBUNISTRING_LIBOBJ([unilbrk/ulc-width-linebreaks])
 
 Makefile.am:
-lib_SOURCES += unilbrk/ulc-width-linebreaks.c
 
 Include:
 "unilbrk.h"
-- 
1.6.6.1






reply via email to

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