Don't use AC_LIBOBJ with file names in subdirectories.

18 files changed, 72 insertions, 18 deletions

diff --git a/modules/uniconv/u16-conv-from-enc b/modules/uniconv/u16-conv-from-enc
index 869428514d..ca84ed97cf 100644
--- a/modules/uniconv/u16-conv-from-enc
+++ b/modules/uniconv/u16-conv-from-enc
@@ -15,9 +15,12 @@ unistr/u16-mblen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-conv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_FROM_ENC
+lib_SOURCES += uniconv/u16-conv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-conv-to-enc b/modules/uniconv/u16-conv-to-enc
index 9854682cd4..287076f72f 100644
--- a/modules/uniconv/u16-conv-to-enc
+++ b/modules/uniconv/u16-conv-to-enc
@@ -16,9 +16,12 @@ unistr/u8-mblen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-conv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_CONV_TO_ENC
+lib_SOURCES += uniconv/u16-conv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-from-enc b/modules/uniconv/u16-strconv-from-enc
index 5dcba745c0..b6c1520df4 100644
--- a/modules/uniconv/u16-strconv-from-enc
+++ b/modules/uniconv/u16-strconv-from-enc
@@ -11,9 +11,12 @@ uniconv/u16-conv-from-enc
 unistr/u16-strlen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_ENC
+lib_SOURCES += uniconv/u16-strconv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-from-locale b/modules/uniconv/u16-strconv-from-locale
index 4239f50efc..e6b060e0a7 100644
--- a/modules/uniconv/u16-strconv-from-locale
+++ b/modules/uniconv/u16-strconv-from-locale
@@ -10,9 +10,12 @@ uniconv/u16-strconv-from-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-from-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_FROM_LOCALE
+lib_SOURCES += uniconv/u16-strconv-from-locale.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-to-enc b/modules/uniconv/u16-strconv-to-enc
index 354f095e04..d4805590d7 100644
--- a/modules/uniconv/u16-strconv-to-enc
+++ b/modules/uniconv/u16-strconv-to-enc
@@ -14,9 +14,12 @@ unistr/u16-strlen
 
 configure.ac:
 AC_REQUIRE([gl_BIGENDIAN])
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_ENC
+lib_SOURCES += uniconv/u16-strconv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u16-strconv-to-locale b/modules/uniconv/u16-strconv-to-locale
index 22845de1db..12fd3c48e8 100644
--- a/modules/uniconv/u16-strconv-to-locale
+++ b/modules/uniconv/u16-strconv-to-locale
@@ -10,9 +10,12 @@ uniconv/u16-strconv-to-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u16-strconv-to-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U16_STRCONV_TO_LOCALE
+lib_SOURCES += uniconv/u16-strconv-to-locale.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-conv-from-enc b/modules/uniconv/u32-conv-from-enc
index a3fb5ec0e2..d72e7c29b3 100644
--- a/modules/uniconv/u32-conv-from-enc
+++ b/modules/uniconv/u32-conv-from-enc
@@ -14,9 +14,12 @@ unistr/u8-mblen
 unistr/u32-mblen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-conv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_FROM_ENC
+lib_SOURCES += uniconv/u32-conv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-conv-to-enc b/modules/uniconv/u32-conv-to-enc
index 465fae4113..8aa6b09b0d 100644
--- a/modules/uniconv/u32-conv-to-enc
+++ b/modules/uniconv/u32-conv-to-enc
@@ -14,9 +14,12 @@ unistr/u32-mblen
 unistr/u8-mblen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-conv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_CONV_TO_ENC
+lib_SOURCES += uniconv/u32-conv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-from-enc b/modules/uniconv/u32-strconv-from-enc
index fd0117113e..7c2846d1f9 100644
--- a/modules/uniconv/u32-strconv-from-enc
+++ b/modules/uniconv/u32-strconv-from-enc
@@ -11,9 +11,12 @@ uniconv/u32-conv-from-enc
 unistr/u32-strlen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_ENC
+lib_SOURCES += uniconv/u32-strconv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-from-locale b/modules/uniconv/u32-strconv-from-locale
index e8e28bb11f..e05dbed77d 100644
--- a/modules/uniconv/u32-strconv-from-locale
+++ b/modules/uniconv/u32-strconv-from-locale
@@ -10,9 +10,12 @@ uniconv/u32-strconv-from-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-from-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_FROM_LOCALE
+lib_SOURCES += uniconv/u32-strconv-from-locale.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-to-enc b/modules/uniconv/u32-strconv-to-enc
index 1a0c5f39bd..e83477e8cb 100644
--- a/modules/uniconv/u32-strconv-to-enc
+++ b/modules/uniconv/u32-strconv-to-enc
@@ -13,9 +13,12 @@ unistr/u32-to-u8
 unistr/u32-strlen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_ENC
+lib_SOURCES += uniconv/u32-strconv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u32-strconv-to-locale b/modules/uniconv/u32-strconv-to-locale
index 022402df47..65260f6fbf 100644
--- a/modules/uniconv/u32-strconv-to-locale
+++ b/modules/uniconv/u32-strconv-to-locale
@@ -10,9 +10,12 @@ uniconv/u32-strconv-to-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u32-strconv-to-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U32_STRCONV_TO_LOCALE
+lib_SOURCES += uniconv/u32-strconv-to-locale.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-conv-from-enc b/modules/uniconv/u8-conv-from-enc
index 8ca0283a02..55321503c0 100644
--- a/modules/uniconv/u8-conv-from-enc
+++ b/modules/uniconv/u8-conv-from-enc
@@ -12,9 +12,12 @@ unistr/u8-check
 unistr/u8-mblen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-conv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC
+lib_SOURCES += uniconv/u8-conv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-conv-to-enc b/modules/uniconv/u8-conv-to-enc
index a49fe82132..8ab4443055 100644
--- a/modules/uniconv/u8-conv-to-enc
+++ b/modules/uniconv/u8-conv-to-enc
@@ -11,9 +11,12 @@ striconveha
 unistr/u8-check
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-conv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_CONV_TO_ENC
+lib_SOURCES += uniconv/u8-conv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-from-enc b/modules/uniconv/u8-strconv-from-enc
index e873b18693..c27b9890be 100644
--- a/modules/uniconv/u8-strconv-from-enc
+++ b/modules/uniconv/u8-strconv-from-enc
@@ -11,9 +11,12 @@ uniconv/u8-conv-from-enc
 unistr/u8-strlen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-from-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-from-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_ENC
+lib_SOURCES += uniconv/u8-strconv-from-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-from-locale b/modules/uniconv/u8-strconv-from-locale
index 1112c275d7..e2a1f9d902 100644
--- a/modules/uniconv/u8-strconv-from-locale
+++ b/modules/uniconv/u8-strconv-from-locale
@@ -10,9 +10,12 @@ uniconv/u8-strconv-from-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-from-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-from-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_LOCALE
+lib_SOURCES += uniconv/u8-strconv-from-locale.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-to-enc b/modules/uniconv/u8-strconv-to-enc
index c0bcb7cc28..533a4536a2 100644
--- a/modules/uniconv/u8-strconv-to-enc
+++ b/modules/uniconv/u8-strconv-to-enc
@@ -12,9 +12,12 @@ unistr/u8-check
 unistr/u8-strlen
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-to-enc.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-to-enc])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_ENC
+lib_SOURCES += uniconv/u8-strconv-to-enc.c
+endif
 
 Include:
 "uniconv.h"
diff --git a/modules/uniconv/u8-strconv-to-locale b/modules/uniconv/u8-strconv-to-locale
index 2b9dc3cbe9..7d3e65278e 100644
--- a/modules/uniconv/u8-strconv-to-locale
+++ b/modules/uniconv/u8-strconv-to-locale
@@ -10,9 +10,12 @@ uniconv/u8-strconv-to-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_LIBSOURCE([0.9], [uniconv/u8-strconv-to-locale.c])
+gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-to-locale])
 
 Makefile.am:
+if LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE
+lib_SOURCES += uniconv/u8-strconv-to-locale.c
+endif
 
 Include:
 "uniconv.h"