List all generated files in the moopp rule.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index ac3b03763dde97b02f6ae7fdd3ce50e9ca636077..58e76a131793fadd6169f27f0c5a1428eba96565 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-13  Bruno Haible  <bruno@clisp.org>
+
+       * modules/ostream (Makefile.am): List all generated files in the moopp
+       rule.
+       * 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-12  Bruno Haible  <bruno@clisp.org>
 
        Fix moopp rules for parallel make.

diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream
index 937da5e27566d648a24949b0046fc7456cfec21e..2c1325e902e6016fad093009349a268b8cfa542f 100644 (file)
--- a/gnulib-local/modules/fd-ostream
+++ b/gnulib-local/modules/fd-ostream
@@ -21,7 +21,7 @@ lib_SOURCES += fd-ostream.c
 # 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
-fd-ostream.c : fd-ostream.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 \

diff --git a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
index 9f4906e296aba0bb67bcc089fec90c752241e474..a7627ddd969880fca35d7f1b0df4f7138f1af51c 100644 (file)
--- a/gnulib-local/modules/file-ostream
+++ b/gnulib-local/modules/file-ostream
@@ -17,7 +17,7 @@ lib_SOURCES += file-ostream.c
 # 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
-file-ostream.c : file-ostream.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 \

diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
index 67003d64e4321e4f022f5d113f8f22c4ebe03c2f..e1c588c1ce599c1a1b7970828aa86fddf026072a 100644 (file)
--- a/gnulib-local/modules/html-ostream
+++ b/gnulib-local/modules/html-ostream
@@ -20,7 +20,7 @@ lib_SOURCES += html-ostream.c
 # 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
-html-ostream.c : html-ostream.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 \

diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream
index e8fb5b9686787dcc2ac8dfa59329661617abf56c..37714429ab65dcb35b986f741bcb4a3f61ebca2f 100644 (file)
--- a/gnulib-local/modules/html-styled-ostream
+++ b/gnulib-local/modules/html-styled-ostream
@@ -24,7 +24,7 @@ lib_SOURCES += html-styled-ostream.c
 # 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
-html-styled-ostream.c : html-styled-ostream.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 \

diff --git a/gnulib-local/modules/iconv-ostream b/gnulib-local/modules/iconv-ostream
index 3d7c8f11c6cb12ad0769166c76e1301c6a94b033..311320bbca83334ae976788b4b3fa4a8a64c24e0 100644 (file)
--- a/gnulib-local/modules/iconv-ostream
+++ b/gnulib-local/modules/iconv-ostream
@@ -22,7 +22,7 @@ lib_SOURCES += iconv-ostream.c
 # 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
-iconv-ostream.c : iconv-ostream.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 \

diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream
index c92e9c5f0097a56492c9e1cb35a93cce0278a388..cfa98e1aeb8e865bd68aaa0c42f330c5087374a9 100644 (file)
--- a/gnulib-local/modules/memory-ostream
+++ b/gnulib-local/modules/memory-ostream
@@ -21,7 +21,7 @@ lib_SOURCES += memory-ostream.c
 # 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
-memory-ostream.c : memory-ostream.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 \

diff --git a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
index 389de135def6fa63efb495e5ceb2eb1f9b97d71f..06611b78d3eae9f0b401aa3d7a4b30101dafebe9 100644 (file)
--- a/gnulib-local/modules/ostream
+++ b/gnulib-local/modules/ostream
@@ -16,7 +16,7 @@ lib_SOURCES += ostream.c
 # 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
-ostream.c : ostream.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 \

diff --git a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
index 884192d953e918ed9fabd0c2039642c31ef4d438..5cfcb49c76ceb2d68edf9075253a29ff035308f0 100644 (file)
--- a/gnulib-local/modules/styled-ostream
+++ b/gnulib-local/modules/styled-ostream
@@ -16,7 +16,7 @@ lib_SOURCES += styled-ostream.c
 # 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
-styled-ostream.c : styled-ostream.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 \

diff --git a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
index e7fb881c0165e2988ab12086d7f79a974ccccbec..4b491745701aab197b10ec76f08a6959d8d47d79 100644 (file)
--- a/gnulib-local/modules/term-ostream
+++ b/gnulib-local/modules/term-ostream
@@ -27,7 +27,7 @@ lib_SOURCES += term-ostream.c
 # 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
-term-ostream.c : term-ostream.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 \

diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream
index 10735359325ebc86549f22e39da5843b766b5c5d..9c980ffa52a6e5ba11892d51aa70251f9aba5a52 100644 (file)
--- a/gnulib-local/modules/term-styled-ostream
+++ b/gnulib-local/modules/term-styled-ostream
@@ -21,7 +21,7 @@ lib_SOURCES += term-styled-ostream.c
 # 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
-term-styled-ostream.c : term-styled-ostream.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 \