New variable MOOPPFLAGS.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index e8b7a264de4b6ff997e0e44ab304296605000443..a4522c04c782d1a53ba0d17de958751cb37abebb 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,19 @@
+2006-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * modules/moo (Makefile.am): Declare MOOPPFLAGS.
+       * modules/moo-tests (Makefile.am): Pass the MOOPPFLAGS to every moopp
+       invocation.
+       * modules/ostream (Makefile.am): Likewise.
+       * modules/fd-ostream (Makefile.am): Likewise.
+       * modules/file-ostream (Makefile.am): Likewise.
+       * modules/html-ostream (Makefile.am): Likewise.
+       * modules/iconv-ostream (Makefile.am): Likewise.
+       * modules/memory-ostream (Makefile.am): Likewise.
+       * modules/term-ostream (Makefile.am): Likewise.
+       * modules/styled-ostream (Makefile.am): Likewise.
+       * modules/html-styled-ostream (Makefile.am): Likewise.
+       * modules/term-styled-ostream (Makefile.am): Likewise.
+
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
        * lib/diffseq.h (diag, compareseq): Use the EQUAL macro.

diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream
index 7553900b169ff8655fab5274ae4edf4785e7b084..44201215ce8e696c7add93c5c4e6d45b6bd26f4f 100644 (file)
--- a/gnulib-local/modules/fd-ostream
+++ b/gnulib-local/modules/fd-ostream
@@ -20,13 +20,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf fd-ostream.lock' 1 2 13 15; \
          if mkdir fd-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/fd-ostream.oo.c $(srcdir)/fd-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf fd-ostream.lock; exit $$result; \
          else \
            while test -d fd-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
index 25dd964b1ae8744944617bed0bd07689eeca47e9..6965c37df67414c0c0a830fb1b16cc6f0d44380e 100644 (file)
--- a/gnulib-local/modules/file-ostream
+++ b/gnulib-local/modules/file-ostream
@@ -16,13 +16,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf file-ostream.lock' 1 2 13 15; \
          if mkdir file-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/file-ostream.oo.c $(srcdir)/file-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf file-ostream.lock; exit $$result; \
          else \
            while test -d file-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
index 9ece64422199fc0140109776cd8803b6e40a42cb..151dba0d45ab429b44c18a0c8fe8daa007c7b477 100644 (file)
--- a/gnulib-local/modules/html-ostream
+++ b/gnulib-local/modules/html-ostream
@@ -19,13 +19,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf html-ostream.lock' 1 2 13 15; \
          if mkdir html-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/html-ostream.oo.c $(srcdir)/html-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf html-ostream.lock; exit $$result; \
          else \
            while test -d html-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream
index b889a475302a551ef169fe1942be1439aa49cd1b..c96343f3fb50eb842fe090d07758d12a89c4b2b2 100644 (file)
--- a/gnulib-local/modules/html-styled-ostream
+++ b/gnulib-local/modules/html-styled-ostream
@@ -23,13 +23,13 @@ lib_SOURCES += html-styled-ostream.c
 # 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/html-styled-ostream.oo.c $(srcdir)/html-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf html-styled-ostream.lock' 1 2 13 15; \
          if mkdir html-styled-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/html-styled-ostream.oo.c $(srcdir)/html-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/html-styled-ostream.oo.c $(srcdir)/html-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(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"; \
+           $(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; \
            result=$$?; rm -rf html-styled-ostream.lock; exit $$result; \
          else \
            while test -d html-styled-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/iconv-ostream b/gnulib-local/modules/iconv-ostream
index 887b05327c9b4aa9f902452d843cdcaf9d8378fe..15a66feb8b6aed9f7f637406c0daa4613e0832e8 100644 (file)
--- a/gnulib-local/modules/iconv-ostream
+++ b/gnulib-local/modules/iconv-ostream
@@ -21,13 +21,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf iconv-ostream.lock' 1 2 13 15; \
          if mkdir iconv-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/iconv-ostream.oo.c $(srcdir)/iconv-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf iconv-ostream.lock; exit $$result; \
          else \
            while test -d iconv-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream
index 171831fc150c281ccb0b5b6ea01b09fbb792e4e8..478cc4ca829810789f35971b1052fc3e6922e272 100644 (file)
--- a/gnulib-local/modules/memory-ostream
+++ b/gnulib-local/modules/memory-ostream
@@ -20,13 +20,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf memory-ostream.lock' 1 2 13 15; \
          if mkdir memory-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf memory-ostream.lock; exit $$result; \
          else \
            while test -d memory-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/moo b/gnulib-local/modules/moo
index 5e2f197d71176102c2eaa0a0b07a24abf61eb32c..714d38796625ebf9d2f55f3e015c170611acd9b3 100644 (file)
--- a/gnulib-local/modules/moo
+++ b/gnulib-local/modules/moo
@@ -11,6 +11,7 @@ configure.ac:
 AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
+MOOPPFLAGS =
 
 Include:
 "moo.h"

diff --git a/gnulib-local/modules/moo-tests b/gnulib-local/modules/moo-tests
index 77fb3358348f8147e33fb1892a1b84ee6300c772..715ea23ed1a4da28ccb94467a97ce6f0153f7718 100644 (file)
--- a/gnulib-local/modules/moo-tests
+++ b/gnulib-local/modules/moo-tests
@@ -17,17 +17,17 @@ configure.ac:
 
 Makefile.am:
 test-moo-root.h test-moo-root.c root.priv.h root.vt.h : $(top_srcdir)/build-aux/moopp test-moo-root.oo.h test-moo-root.oo.c
-       $(top_srcdir)/build-aux/moopp $(srcdir)/test-moo-root.oo.c $(srcdir)/test-moo-root.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/test-moo-root.oo.c $(srcdir)/test-moo-root.oo.h
 
 test-moo-sub1.h test-moo-sub1.c sub1.priv.h sub1.vt.h : $(top_srcdir)/build-aux/moopp test-moo-root.oo.h test-moo-sub1.oo.h test-moo-sub1.oo.c
-       $(top_srcdir)/build-aux/moopp $(srcdir)/test-moo-sub1.oo.c $(srcdir)/test-moo-sub1.oo.h $(srcdir)/test-moo-root.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/test-moo-sub1.oo.c $(srcdir)/test-moo-sub1.oo.h $(srcdir)/test-moo-root.oo.h
 
 test-moo-sub2.h test-moo-sub2.c sub2.priv.h sub2.vt.h : $(top_srcdir)/build-aux/moopp test-moo-root.oo.h test-moo-sub1.oo.h test-moo-sub2.oo.h test-moo-sub2.oo.c
-       $(top_srcdir)/build-aux/moopp $(srcdir)/test-moo-sub2.oo.c $(srcdir)/test-moo-sub2.oo.h $(srcdir)/test-moo-sub1.oo.h $(srcdir)/test-moo-root.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/test-moo-sub2.oo.c $(srcdir)/test-moo-sub2.oo.h $(srcdir)/test-moo-sub1.oo.h $(srcdir)/test-moo-root.oo.h
 
 test-moo-aroot.h test-moo-aroot.c aroot.priv.h aroot.vt.h : $(top_srcdir)/build-aux/moopp test-moo-aroot.oo.h test-moo-aroot.oo.c
-       $(top_srcdir)/build-aux/moopp $(srcdir)/test-moo-aroot.oo.c $(srcdir)/test-moo-aroot.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/test-moo-aroot.oo.c $(srcdir)/test-moo-aroot.oo.h
 
 test-moo-asub1.h test-moo-asub1.c asub1.priv.h asub1.vt.h : $(top_srcdir)/build-aux/moopp test-moo-aroot.oo.h test-moo-asub1.oo.h test-moo-asub1.oo.c
-       $(top_srcdir)/build-aux/moopp $(srcdir)/test-moo-asub1.oo.c $(srcdir)/test-moo-asub1.oo.h $(srcdir)/test-moo-aroot.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/test-moo-asub1.oo.c $(srcdir)/test-moo-asub1.oo.h $(srcdir)/test-moo-aroot.oo.h
 

diff --git a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
index 6792ef06239c904e0f9b3011f9498fc86cb91075..fa7c72c447edfdaa9c6ce568319213c4e2e41d5a 100644 (file)
--- a/gnulib-local/modules/ostream
+++ b/gnulib-local/modules/ostream
@@ -15,13 +15,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h
+       $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h
 ostream.c ostream.priv.h ostream.vt.h : ostream.h
        @test -f $@ || { \
          trap 'rm -rf ostream.lock' 1 2 13 15; \
          if mkdir ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/ostream.oo.c $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf ostream.lock; exit $$result; \
          else \
            while test -d ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
index b4116d6c6ce053631f485425c7bb8783660a5b6e..be796fb2f6b7f3427f97a7e91b1034f96cd1920b 100644 (file)
--- a/gnulib-local/modules/styled-ostream
+++ b/gnulib-local/modules/styled-ostream
@@ -15,13 +15,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf styled-ostream.lock' 1 2 13 15; \
          if mkdir styled-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/styled-ostream.oo.c $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf styled-ostream.lock; exit $$result; \
          else \
            while test -d styled-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
index 4420373cbf0eac91d60294c03fdd6c118bfb5175..e48e247b95f6c4bb3f2d78daff1b639e5161d597 100644 (file)
--- a/gnulib-local/modules/term-ostream
+++ b/gnulib-local/modules/term-ostream
@@ -26,13 +26,13 @@ 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf term-ostream.lock' 1 2 13 15; \
          if mkdir term-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/ostream.oo.h"; \
+           $(top_srcdir)/build-aux/moopp $(MOOPPFLAGS) $(srcdir)/term-ostream.oo.c $(srcdir)/term-ostream.oo.h $(srcdir)/ostream.oo.h; \
            result=$$?; rm -rf term-ostream.lock; exit $$result; \
          else \
            while test -d term-ostream.lock; do sleep 1; done; \

diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream
index 7a77f171e01583a4e6c1364562c42e293d016389..9246e6e51ff44ee95c0d051ed82ba93b4f5c36b9 100644 (file)
--- a/gnulib-local/modules/term-styled-ostream
+++ b/gnulib-local/modules/term-styled-ostream
@@ -20,13 +20,13 @@ lib_SOURCES += term-styled-ostream.c
 # 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
-       $(top_srcdir)/build-aux/moopp $(srcdir)/term-styled-ostream.oo.c $(srcdir)/term-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/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
        @test -f $@ || { \
          trap 'rm -rf term-styled-ostream.lock' 1 2 13 15; \
          if mkdir term-styled-ostream.lock 2>/dev/null; then \
-           echo "$(top_srcdir)/build-aux/moopp $(srcdir)/term-styled-ostream.oo.c $(srcdir)/term-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h"; \
-           $(top_srcdir)/build-aux/moopp $(srcdir)/term-styled-ostream.oo.c $(srcdir)/term-styled-ostream.oo.h $(srcdir)/styled-ostream.oo.h $(srcdir)/ostream.oo.h; \
+           echo "$(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"; \
+           $(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; \
            result=$$?; rm -rf term-styled-ostream.lock; exit $$result; \
          else \
            while test -d term-styled-ostream.lock; do sleep 1; done; \