libtextstyle: Add support for VPATH builds with OpenBSD 'make'.

* gnulib-local/modules/*ostream (Makefile.am): In the rules that use moopp,
prefix the target file names with '$(srcdir)/'.

diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream
index ff03106e4923dd9462f679b941661bf450fd0a31..99e1f87445d843a8faf7ac49273ef9809208191f 100644 (file)
--- a/gnulib-local/modules/fd-ostream
+++ b/gnulib-local/modules/fd-ostream
@@ -19,9 +19,9 @@ Makefile.am:
 lib_SOURCES += fd-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-fd-ostream.h : $(top_srcdir)/build-aux/moopp fd-ostream.oo.h fd-ostream.oo.c ostream.oo.h
+$(srcdir)/fd-ostream.h : $(top_srcdir)/build-aux/moopp fd-ostream.oo.h fd-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/ostream.oo.h
-fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h : fd-ostream.h
+$(srcdir)/fd-ostream.c $(srcdir)/fd_ostream.priv.h $(srcdir)/fd_ostream.vt.h : fd-ostream.h
        @test -f $@ || { \
          trap 'rm -rf fd-ostream.lock' 1 2 13 15; \
          if mkdir fd-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/fd-styled-ostream b/gnulib-local/modules/fd-styled-ostream
index 022eaa4211f8dc4514fcdcfda8aefcf124e3d1e0..1b8582aff0751e2ce100f199f1902ec9c35b20c8 100644 (file)
--- a/gnulib-local/modules/fd-styled-ostream
+++ b/gnulib-local/modules/fd-styled-ostream
@@ -20,9 +20,9 @@ lib_SOURCES += ../woe32dll/c++fd-styled-ostream.cc
 endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-fd-styled-ostream.h : $(top_srcdir)/build-aux/moopp fd-styled-ostream.oo.h fd-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
+$(srcdir)/fd-styled-ostream.h : $(top_srcdir)/build-aux/moopp fd-styled-ostream.oo.h fd-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/fd-styled-ostream.oo.c $(srcdir)/fd-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h
-fd-styled-ostream.c fd_styled_ostream.priv.h fd_styled_ostream.vt.h : fd-styled-ostream.h
+$(srcdir)/fd-styled-ostream.c $(srcdir)/fd_styled_ostream.priv.h $(srcdir)/fd_styled_ostream.vt.h : fd-styled-ostream.h
        @test -f $@ || { \
          trap 'rm -rf fd-styled-ostream.lock' 1 2 13 15; \
          if mkdir fd-styled-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
index 6965c37df67414c0c0a830fb1b16cc6f0d44380e..23dff47fa1283602b7afd017e2eef17281c4927a 100644 (file)
--- a/gnulib-local/modules/file-ostream
+++ b/gnulib-local/modules/file-ostream
@@ -15,9 +15,9 @@ Makefile.am:
 lib_SOURCES += file-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
+$(srcdir)/file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/ostream.oo.h
-file-ostream.c file_ostream.priv.h file_ostream.vt.h : file-ostream.h
+$(srcdir)/file-ostream.c $(srcdir)/file_ostream.priv.h $(srcdir)/file_ostream.vt.h : file-ostream.h
        @test -f $@ || { \
          trap 'rm -rf file-ostream.lock' 1 2 13 15; \
          if mkdir file-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
index 6d877fa37be046c6c5a545e44b3192ff16589bf6..35ee411146166a2cd315078562de87fed36081f8 100644 (file)
--- a/gnulib-local/modules/html-ostream
+++ b/gnulib-local/modules/html-ostream
@@ -19,9 +19,9 @@ Makefile.am:
 lib_SOURCES += html-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
+$(srcdir)/html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/ostream.oo.h
-html-ostream.c html_ostream.priv.h html_ostream.vt.h : html-ostream.h
+$(srcdir)/html-ostream.c $(srcdir)/html_ostream.priv.h $(srcdir)/html_ostream.vt.h : html-ostream.h
        @test -f $@ || { \
          trap 'rm -rf html-ostream.lock' 1 2 13 15; \
          if mkdir html-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream
index e7892487f4c8b7bc3b5a714d77bbbf6fc7b8ead4..7be0c0aef380917793bc97f11bcc803ae93667e9 100644 (file)
--- a/gnulib-local/modules/html-styled-ostream
+++ b/gnulib-local/modules/html-styled-ostream
@@ -26,9 +26,9 @@ lib_SOURCES += ../woe32dll/c++html-styled-ostream.cc
 endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
+$(srcdir)/html-styled-ostream.h : $(top_srcdir)/build-aux/moopp html-styled-ostream.oo.h html-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/html-styled-ostream.oo.c $(srcdir)/html-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h
-html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h : html-styled-ostream.h
+$(srcdir)/html-styled-ostream.c $(srcdir)/html_styled_ostream.priv.h $(srcdir)/html_styled_ostream.vt.h : html-styled-ostream.h
        @test -f $@ || { \
          trap 'rm -rf html-styled-ostream.lock' 1 2 13 15; \
          if mkdir html-styled-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/iconv-ostream b/gnulib-local/modules/iconv-ostream
index eaf203a3ee52ad0603a6a1fdb863bfe1b6672abf..6cf1e31dc9a3dd5ce78b63a526955dcfb7e3c124 100644 (file)
--- a/gnulib-local/modules/iconv-ostream
+++ b/gnulib-local/modules/iconv-ostream
@@ -20,9 +20,9 @@ Makefile.am:
 lib_SOURCES += iconv-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-iconv-ostream.h : $(top_srcdir)/build-aux/moopp iconv-ostream.oo.h iconv-ostream.oo.c ostream.oo.h
+$(srcdir)/iconv-ostream.h : $(top_srcdir)/build-aux/moopp iconv-ostream.oo.h iconv-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/ostream.oo.h
-iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h : iconv-ostream.h
+$(srcdir)/iconv-ostream.c $(srcdir)/iconv_ostream.priv.h $(srcdir)/iconv_ostream.vt.h : iconv-ostream.h
        @test -f $@ || { \
          trap 'rm -rf iconv-ostream.lock' 1 2 13 15; \
          if mkdir iconv-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream
index e6ba698fe859abc2c5123858a799aba6aae58251..d26a8b296b976780247f6f12107ef0301ee99ce8 100644 (file)
--- a/gnulib-local/modules/memory-ostream
+++ b/gnulib-local/modules/memory-ostream
@@ -19,9 +19,9 @@ Makefile.am:
 lib_SOURCES += memory-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-memory-ostream.h : $(top_srcdir)/build-aux/moopp memory-ostream.oo.h memory-ostream.oo.c ostream.oo.h
+$(srcdir)/memory-ostream.h : $(top_srcdir)/build-aux/moopp memory-ostream.oo.h memory-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h
-memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h : memory-ostream.h
+$(srcdir)/memory-ostream.c $(srcdir)/memory_ostream.priv.h $(srcdir)/memory_ostream.vt.h : memory-ostream.h
        @test -f $@ || { \
          trap 'rm -rf memory-ostream.lock' 1 2 13 15; \
          if mkdir memory-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
index fa7c72c447edfdaa9c6ce568319213c4e2e41d5a..720ad95f488c47e11e82892a0056cb97a0cf0285 100644 (file)
--- a/gnulib-local/modules/ostream
+++ b/gnulib-local/modules/ostream
@@ -14,9 +14,9 @@ Makefile.am:
 lib_SOURCES += ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
+$(srcdir)/ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h
-ostream.c ostream.priv.h ostream.vt.h : ostream.h
+$(srcdir)/ostream.c $(srcdir)/ostream.priv.h $(srcdir)/ostream.vt.h : ostream.h
        @test -f $@ || { \
          trap 'rm -rf ostream.lock' 1 2 13 15; \
          if mkdir ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
index be796fb2f6b7f3427f97a7e91b1034f96cd1920b..f9911e635be868796b00a1d5fab2b9634ef65ecd 100644 (file)
--- a/gnulib-local/modules/styled-ostream
+++ b/gnulib-local/modules/styled-ostream
@@ -14,9 +14,9 @@ Makefile.am:
 lib_SOURCES += styled-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
+$(srcdir)/styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h
-styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h : styled-ostream.h
+$(srcdir)/styled-ostream.c $(srcdir)/styled_ostream.priv.h $(srcdir)/styled_ostream.vt.h : styled-ostream.h
        @test -f $@ || { \
          trap 'rm -rf styled-ostream.lock' 1 2 13 15; \
          if mkdir styled-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
index 8b6799e60c999593978df181b5fa72cf46318d4c..da38fa1027d644a5d6d2b7eba0d28c45ff53617f 100644 (file)
--- a/gnulib-local/modules/term-ostream
+++ b/gnulib-local/modules/term-ostream
@@ -25,9 +25,9 @@ Makefile.am:
 lib_SOURCES += term-ostream.c
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h
+$(srcdir)/term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/ostream.oo.h
-term-ostream.c term_ostream.priv.h term_ostream.vt.h : term-ostream.h
+$(srcdir)/term-ostream.c $(srcdir)/term_ostream.priv.h $(srcdir)/term_ostream.vt.h : term-ostream.h
        @test -f $@ || { \
          trap 'rm -rf term-ostream.lock' 1 2 13 15; \
          if mkdir term-ostream.lock 2>/dev/null; then \

diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream
index 6bcd4b68e68b195cf23ddc8585617399e0aa7b8f..29dae33f69e2e6a2ba62ee56897c2b809d0ad8c3 100644 (file)
--- a/gnulib-local/modules/term-styled-ostream
+++ b/gnulib-local/modules/term-styled-ostream
@@ -23,9 +23,9 @@ lib_SOURCES += ../woe32dll/c++term-styled-ostream.cc
 endif
 # This is a Makefile rule that generates multiple files at once; see the
 # automake documentation, node "Multiple Outputs", for details.
-term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
+$(srcdir)/term-styled-ostream.h : $(top_srcdir)/build-aux/moopp term-styled-ostream.oo.h term-styled-ostream.oo.c styled-ostream.oo.h ostream.oo.h
        $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/term-styled-ostream.oo.c $(srcdir)/term-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h
-term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h : term-styled-ostream.h
+$(srcdir)/term-styled-ostream.c $(srcdir)/term_styled_ostream.priv.h $(srcdir)/term_styled_ostream.vt.h : term-styled-ostream.h
        @test -f $@ || { \
          trap 'rm -rf term-styled-ostream.lock' 1 2 13 15; \
          if mkdir term-styled-ostream.lock 2>/dev/null; then \