From 24fa82d6cbfb2ce8941b826f152072604a1b3dba Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Feb 2019 03:12:38 +0100 Subject: [PATCH] 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)/'. --- gnulib-local/modules/fd-ostream | 4 ++-- gnulib-local/modules/fd-styled-ostream | 4 ++-- gnulib-local/modules/file-ostream | 4 ++-- gnulib-local/modules/html-ostream | 4 ++-- gnulib-local/modules/html-styled-ostream | 4 ++-- gnulib-local/modules/iconv-ostream | 4 ++-- gnulib-local/modules/memory-ostream | 4 ++-- gnulib-local/modules/ostream | 4 ++-- gnulib-local/modules/styled-ostream | 4 ++-- gnulib-local/modules/term-ostream | 4 ++-- gnulib-local/modules/term-styled-ostream | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream index ff03106e4..99e1f8744 100644 --- 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 022eaa421..1b8582aff 100644 --- 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 6965c37df..23dff47fa 100644 --- 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 6d877fa37..35ee41114 100644 --- 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 e7892487f..7be0c0aef 100644 --- 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 eaf203a3e..6cf1e31dc 100644 --- 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 e6ba698fe..d26a8b296 100644 --- 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 fa7c72c44..720ad95f4 100644 --- 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 be796fb2f..f9911e635 100644 --- 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 8b6799e60..da38fa102 100644 --- 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 6bcd4b68e..29dae33f6 100644 --- 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 \ -- 2.47.2