]> Savannah Git Hosting - gnulib.git/commitdiff
iconv_open, uni*: Add support for VPATH builds with OpenBSD 'make'.
authorBruno Haible <bruno@clisp.org>
Wed, 16 Aug 2017 09:25:10 +0000 (11:25 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 16 Aug 2017 09:25:10 +0000 (11:25 +0200)
* modules/iconv_open (Makefile.am): In the rules that use gperf, prefix
the target file names with '$(srcdir)/'.
* modules/unicase/locale-language (Makefile.am): Likewise.
* modules/unicase/special-casing (Makefile.am): Likewise.
* modules/unictype/bidiclass-byname (Makefile.am): Likewise.
* modules/unictype/category-byname (Makefile.am): Likewise.
* modules/unictype/combining-class-byname (Makefile.am): Likewise.
* modules/unictype/joininggroup-byname (Makefile.am): Likewise.
* modules/unictype/joiningtype-byname (Makefile.am): Likewise.
* modules/unictype/property-byname (Makefile.am): Likewise.
* modules/unictype/scripts (Makefile.am): Likewise.
* modules/uninorm/composition (Makefile.am): Likewise.

12 files changed:
ChangeLog
modules/iconv_open
modules/unicase/locale-language
modules/unicase/special-casing
modules/unictype/bidiclass-byname
modules/unictype/category-byname
modules/unictype/combining-class-byname
modules/unictype/joininggroup-byname
modules/unictype/joiningtype-byname
modules/unictype/property-byname
modules/unictype/scripts
modules/uninorm/composition

index 227a698767806319e5909229ca2ef8e8934650ef..259b9992d5289986357a448310f4c44c0689d11a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2017-08-16  Bruno Haible  <bruno@clisp.org>
+
+       iconv_open, uni*: Add support for VPATH builds with OpenBSD 'make'.
+       * modules/iconv_open (Makefile.am): In the rules that use gperf, prefix
+       the target file names with '$(srcdir)/'.
+       * modules/unicase/locale-language (Makefile.am): Likewise.
+       * modules/unicase/special-casing (Makefile.am): Likewise.
+       * modules/unictype/bidiclass-byname (Makefile.am): Likewise.
+       * modules/unictype/category-byname (Makefile.am): Likewise.
+       * modules/unictype/combining-class-byname (Makefile.am): Likewise.
+       * modules/unictype/joininggroup-byname (Makefile.am): Likewise.
+       * modules/unictype/joiningtype-byname (Makefile.am): Likewise.
+       * modules/unictype/property-byname (Makefile.am): Likewise.
+       * modules/unictype/scripts (Makefile.am): Likewise.
+       * modules/uninorm/composition (Makefile.am): Likewise.
+
 2017-08-16  Bruno Haible  <bruno@clisp.org>
 
        nonblocking-socket tests: Fix failure on OpenBSD 6.0.
index e49c65059b53007463c50a974e9e67d2f76fcfd9..7032dca8b8cf976f1216089d5caa1c89e78c99f8 100644 (file)
@@ -33,19 +33,19 @@ if test $REPLACE_ICONV = 1; then
 fi
 
 Makefile.am:
-iconv_open-aix.h: iconv_open-aix.gperf
+$(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \
        mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
-iconv_open-hpux.h: iconv_open-hpux.gperf
+$(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \
        mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h
-iconv_open-irix.h: iconv_open-irix.gperf
+$(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \
        mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h
-iconv_open-osf.h: iconv_open-osf.gperf
+$(srcdir)/iconv_open-osf.h: $(srcdir)/iconv_open-osf.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \
        mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h
-iconv_open-solaris.h: iconv_open-solaris.gperf
+$(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \
        mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
 BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
index 706f94daf373ece8ec41cb4826236ccc8c860e9a..d2e06f2f2b4ceb6adde3d44a29d2ecfcb3edec9f 100644 (file)
@@ -18,7 +18,7 @@ if LIBUNISTRING_COMPILE_UNICASE_LOCALE_LANGUAGE
 lib_SOURCES += unicase/locale-language.c
 endif
 
-unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
+$(srcdir)/unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t && \
        mv $(srcdir)/unicase/locale-languages.h-t $(srcdir)/unicase/locale-languages.h
 BUILT_SOURCES        += unicase/locale-languages.h
index a4a7fcf4c139a6de22d6a46987228929d80b5898..362f6a108dcec04f7a7033a5eb81e6f69e48c06b 100644 (file)
@@ -14,7 +14,7 @@ configure.ac:
 Makefile.am:
 lib_SOURCES += unicase/special-casing.c
 
-unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
+$(srcdir)/unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \
        mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h
 BUILT_SOURCES        += unicase/special-casing-table.h
index f903ca2ad3076182a6851917f07b2b92ef400f3f..0803c0666b24396c2c507bf42460c2c72f3c46cc 100644 (file)
@@ -17,7 +17,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_BYNAME
 lib_SOURCES += unictype/bidi_byname.c
 endif
 
-unictype/bidi_byname.h: unictype/bidi_byname.gperf
+$(srcdir)/unictype/bidi_byname.h: $(srcdir)/unictype/bidi_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t && \
        mv $(srcdir)/unictype/bidi_byname.h-t $(srcdir)/unictype/bidi_byname.h
 BUILT_SOURCES        += unictype/bidi_byname.h
index 4a8bb2b64c4b6632886e555305c866cd413abcaf..29a754fa45eba5c5d9791468a9f2daff64f52681 100644 (file)
@@ -56,7 +56,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_BYNAME
 lib_SOURCES += unictype/categ_byname.c
 endif
 
-unictype/categ_byname.h: unictype/categ_byname.gperf
+$(srcdir)/unictype/categ_byname.h: $(srcdir)/unictype/categ_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t && \
        mv $(srcdir)/unictype/categ_byname.h-t $(srcdir)/unictype/categ_byname.h
 BUILT_SOURCES        += unictype/categ_byname.h
index f0ef659028ba8a5bb7905547cdb07a2a0a993268..c80b8733a7d28397cd6cb1e7e5841ffbe007f971 100644 (file)
@@ -17,7 +17,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_BYNAME
 lib_SOURCES += unictype/combiningclass_byname.c
 endif
 
-unictype/combiningclass_byname.h: unictype/combiningclass_byname.gperf
+$(srcdir)/unictype/combiningclass_byname.h: $(srcdir)/unictype/combiningclass_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t && \
        mv $(srcdir)/unictype/combiningclass_byname.h-t $(srcdir)/unictype/combiningclass_byname.h
 BUILT_SOURCES        += unictype/combiningclass_byname.h
index 2d478213e943fb3cb8653fcfbe23582e65715b9c..3e076b6b6e5cbb830ab09cec90966311a70da444 100644 (file)
@@ -17,7 +17,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_BYNAME
 lib_SOURCES += unictype/joininggroup_byname.c
 endif
 
-unictype/joininggroup_byname.h: unictype/joininggroup_byname.gperf
+$(srcdir)/unictype/joininggroup_byname.h: $(srcdir)/unictype/joininggroup_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t && \
        mv $(srcdir)/unictype/joininggroup_byname.h-t $(srcdir)/unictype/joininggroup_byname.h
 BUILT_SOURCES        += unictype/joininggroup_byname.h
index 516ce3c1806acff34bbe89fd924e1db94c6f04b4..8054514fdff22b805f4d9bbc4844f721fe076716 100644 (file)
@@ -17,7 +17,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_BYNAME
 lib_SOURCES += unictype/joiningtype_byname.c
 endif
 
-unictype/joiningtype_byname.h: unictype/joiningtype_byname.gperf
+$(srcdir)/unictype/joiningtype_byname.h: $(srcdir)/unictype/joiningtype_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t && \
        mv $(srcdir)/unictype/joiningtype_byname.h-t $(srcdir)/unictype/joiningtype_byname.h
 BUILT_SOURCES        += unictype/joiningtype_byname.h
index 0bb8799d096089b510401c89a3505184591534c1..2d160f07679c82ece6bca2f7a687d522c19f3853 100644 (file)
@@ -103,7 +103,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BYNAME
 lib_SOURCES += unictype/pr_byname.c
 endif
 
-unictype/pr_byname.h: unictype/pr_byname.gperf
+$(srcdir)/unictype/pr_byname.h: $(srcdir)/unictype/pr_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t && \
        mv $(srcdir)/unictype/pr_byname.h-t $(srcdir)/unictype/pr_byname.h
 BUILT_SOURCES        += unictype/pr_byname.h
index f2fab3ab14f97870409a4833711b52a71a605cd9..f60e4e889af9d220e11fd8f98d500367742caca6 100644 (file)
@@ -18,7 +18,7 @@ if LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS
 lib_SOURCES += unictype/scripts.c
 endif
 
-unictype/scripts_byname.h: unictype/scripts_byname.gperf
+$(srcdir)/unictype/scripts_byname.h: $(srcdir)/unictype/scripts_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t && \
        mv $(srcdir)/unictype/scripts_byname.h-t $(srcdir)/unictype/scripts_byname.h
 BUILT_SOURCES        += unictype/scripts_byname.h
index fcef307bebd40a925230a288db428ca29b522ab6..90b074024e4223d1cb9903d909a4c031d4d698ba 100644 (file)
@@ -17,7 +17,7 @@ if LIBUNISTRING_COMPILE_UNINORM_COMPOSITION
 lib_SOURCES += uninorm/composition.c
 endif
 
-uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
+$(srcdir)/uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
        $(V_GPERF)$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t && \
        mv $(srcdir)/uninorm/composition-table.h-t $(srcdir)/uninorm/composition-table.h
 BUILT_SOURCES        += uninorm/composition-table.h