moopp requires GNU sed.

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index 080f62eaa5eb1e7ed1916f5fd3e0045a328bffa2..17e0cb3350a87bfd8e9acee0a88935468843d3d6 100644 (file)
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-13  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (MAINTAINERCLEANFILES): New variable.
+
 2006-11-26  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (config.h): When removing an object file, also remove

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 68e7c13badf825cd4a9f99c0182624ff10d786e1..41f703c0c4878fe2a7b85fd77d434abc05e8cac3 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -23,6 +23,7 @@ BUILT_SOURCES =
 MOSTLYCLEANFILES = core *.stackdump
 CLEANFILES =
 DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 SUFFIXES =
 
 lib_LTLIBRARIES = libgettextpo.la

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 7ddc864595c395a3bf9e8ba4fbbe2ca2a12b9f7e..cddc34a2ba8a366f3ce109ae3fded98e7f1bed08 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,20 @@
+2006-12-13  Bruno Haible  <bruno@clisp.org>
+
+       * build-aux/moopp: Add check for GNU sed. Generate the 4 files in the
+       source directory, not in the current directory.
+       * modules/ostream (Makefile.am): Test for the .h file in the source
+       directory, not in the current directory. Augment MAINTAINERCLEANFILES
+       and EXTRA_DIST, not CLEANFILES.
+       * 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-13  Bruno Haible  <bruno@clisp.org>
 
        Avoid crash on NetBSD.

diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index d744f8ba801df28d120293fc6a867fbbea6e042f..151f90e6e393524517c339ae5c099f25d0708f75 100755 (executable)
--- a/gnulib-local/build-aux/moopp
+++ b/gnulib-local/build-aux/moopp
@@ -128,6 +128,14 @@ sed_remove_comments_ERE="
   :e
 }"
 
+# Check that 'sed' supports the kind of regular expressions used in
+# sed_remove_comments. The use of \| meaning alternation of basic regular
+# expressions is a GNU extension.
+sed_test='s,^\(\(a\|X\)*\)//.*,\1,'
+sed_result=`echo 'aaa//bcd' | sed -e "$sed_test"`
+test "$sed_result" = 'aaa' \
+  || func_fatal_error "The 'sed' program is not GNU sed. Try installing GNU sed."
+
 # func_check_impl_syntax file
 # Check the syntax of the source implementation file.
 # Output:
@@ -633,6 +641,13 @@ func_emit_source_c ()
   } > "$newfile"
 }
 
+# Generate the files in the source directory, not in the current directory.
+# This is needed because they need to be distributed, since not all platforms
+# have GNU 'sed' preinstalled.
+
+sed_butbase='s,[^/]*$,,'
+destdir=`echo "$source_impl_file" | sed -e "$sed_butbase"`
+
 # Generate the source.h file first. The Makefile.am snippets rely on the
 # fact that the other generated files have the same or a newer timestamp.
 #
@@ -640,16 +655,18 @@ func_emit_source_c ()
 # about the other generated files; they assume that when the source.c file
 # is finished, this command is complete.
 
-new_source_header_file=`echo "$source_header_file_base" | sed -e 's,\.oo\.h$,.h,'`
+new_source_header_file="${destdir}"`echo "$source_header_file_base" | sed -e 's,\.oo\.h$,.h,'`
 func_start_creation "$new_source_header_file"
 func_emit_source_h "$new_source_header_file" || func_fatal_error "failed"
 
-func_start_creation "${main_classname}.priv.h"
-func_emit_priv_h "${main_classname}.priv.h" || func_fatal_error "failed"
+new_priv_header_file="${destdir}${main_classname}.priv.h"
+func_start_creation "$new_priv_header_file"
+func_emit_priv_h "$new_priv_header_file" || func_fatal_error "failed"
 
-func_start_creation "${main_classname}.vt.h"
-func_emit_vt_h "${main_classname}.vt.h" || func_fatal_error "failed"
+new_vt_header_file="${destdir}${main_classname}.vt.h"
+func_start_creation "$new_vt_header_file"
+func_emit_vt_h "$new_vt_header_file" || func_fatal_error "failed"
 
-new_source_impl_file=`echo "$source_impl_file_base" | sed -e 's,\.oo\.c$,.c,'`
+new_source_impl_file="${destdir}"`echo "$source_impl_file_base" | sed -e 's,\.oo\.c$,.c,'`
 func_start_creation "$new_source_impl_file"
 func_emit_source_c "$new_source_impl_file" || func_fatal_error "failed"

diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream
index 2c1325e902e6016fad093009349a268b8cfa542f..7553900b169ff8655fab5274ae4edf4785e7b084 100644 (file)
--- a/gnulib-local/modules/fd-ostream
+++ b/gnulib-local/modules/fd-ostream
@@ -30,11 +30,12 @@ fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h : fd-ostream.h
            result=$$?; rm -rf fd-ostream.lock; exit $$result; \
          else \
            while test -d fd-ostream.lock; do sleep 1; done; \
-           test -f fd-ostream.h; \
+           test -f $(srcdir)/fd-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h
-CLEANFILES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h
+MAINTAINERCLEANFILES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h
+EXTRA_DIST += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h
 
 Include:
 "fd-ostream.h"

diff --git a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
index a7627ddd969880fca35d7f1b0df4f7138f1af51c..25dd964b1ae8744944617bed0bd07689eeca47e9 100644 (file)
--- a/gnulib-local/modules/file-ostream
+++ b/gnulib-local/modules/file-ostream
@@ -26,11 +26,12 @@ file-ostream.c file_ostream.priv.h file_ostream.vt.h : file-ostream.h
            result=$$?; rm -rf file-ostream.lock; exit $$result; \
          else \
            while test -d file-ostream.lock; do sleep 1; done; \
-           test -f file-ostream.h; \
+           test -f $(srcdir)/file-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h
-CLEANFILES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h
+MAINTAINERCLEANFILES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h
+EXTRA_DIST += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h
 
 Include:
 "file-ostream.h"

diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
index e1c588c1ce599c1a1b7970828aa86fddf026072a..9ece64422199fc0140109776cd8803b6e40a42cb 100644 (file)
--- a/gnulib-local/modules/html-ostream
+++ b/gnulib-local/modules/html-ostream
@@ -29,11 +29,12 @@ html-ostream.c html_ostream.priv.h html_ostream.vt.h : html-ostream.h
            result=$$?; rm -rf html-ostream.lock; exit $$result; \
          else \
            while test -d html-ostream.lock; do sleep 1; done; \
-           test -f html-ostream.h; \
+           test -f $(srcdir)/html-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h
-CLEANFILES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h
+MAINTAINERCLEANFILES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h
+EXTRA_DIST += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h
 
 Include:
 "html-ostream.h"

diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream
index 37714429ab65dcb35b986f741bcb4a3f61ebca2f..b889a475302a551ef169fe1942be1439aa49cd1b 100644 (file)
--- a/gnulib-local/modules/html-styled-ostream
+++ b/gnulib-local/modules/html-styled-ostream
@@ -33,11 +33,12 @@ html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h : html
            result=$$?; rm -rf html-styled-ostream.lock; exit $$result; \
          else \
            while test -d html-styled-ostream.lock; do sleep 1; done; \
-           test -f html-styled-ostream.h; \
+           test -f $(srcdir)/html-styled-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h
-CLEANFILES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h
+MAINTAINERCLEANFILES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h
+EXTRA_DIST += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h
 
 Include:
 "html-styled-ostream.h"

diff --git a/gnulib-local/modules/iconv-ostream b/gnulib-local/modules/iconv-ostream
index 311320bbca83334ae976788b4b3fa4a8a64c24e0..887b05327c9b4aa9f902452d843cdcaf9d8378fe 100644 (file)
--- a/gnulib-local/modules/iconv-ostream
+++ b/gnulib-local/modules/iconv-ostream
@@ -31,11 +31,12 @@ iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h : iconv-ostream.h
            result=$$?; rm -rf iconv-ostream.lock; exit $$result; \
          else \
            while test -d iconv-ostream.lock; do sleep 1; done; \
-           test -f iconv-ostream.h; \
+           test -f $(srcdir)/iconv-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h
-CLEANFILES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h
+MAINTAINERCLEANFILES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h
+EXTRA_DIST += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h
 
 Include:
 "iconv-ostream.h"

diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream
index cfa98e1aeb8e865bd68aaa0c42f330c5087374a9..171831fc150c281ccb0b5b6ea01b09fbb792e4e8 100644 (file)
--- a/gnulib-local/modules/memory-ostream
+++ b/gnulib-local/modules/memory-ostream
@@ -30,11 +30,12 @@ memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h : memory-ostream.h
            result=$$?; rm -rf memory-ostream.lock; exit $$result; \
          else \
            while test -d memory-ostream.lock; do sleep 1; done; \
-           test -f memory-ostream.h; \
+           test -f $(srcdir)/memory-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
-CLEANFILES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
+MAINTAINERCLEANFILES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
+EXTRA_DIST += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
 
 Include:
 "memory-ostream.h"

diff --git a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
index 06611b78d3eae9f0b401aa3d7a4b30101dafebe9..6792ef06239c904e0f9b3011f9498fc86cb91075 100644 (file)
--- a/gnulib-local/modules/ostream
+++ b/gnulib-local/modules/ostream
@@ -25,11 +25,12 @@ ostream.c ostream.priv.h ostream.vt.h : ostream.h
            result=$$?; rm -rf ostream.lock; exit $$result; \
          else \
            while test -d ostream.lock; do sleep 1; done; \
-           test -f ostream.h; \
+           test -f $(srcdir)/ostream.h; \
          fi; \
        }
 BUILT_SOURCES += ostream.h ostream.c ostream.priv.h ostream.vt.h
-CLEANFILES += ostream.h ostream.c ostream.priv.h ostream.vt.h
+MAINTAINERCLEANFILES += ostream.h ostream.c ostream.priv.h ostream.vt.h
+EXTRA_DIST += ostream.h ostream.c ostream.priv.h ostream.vt.h
 
 Include:
 "ostream.h"

diff --git a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
index 5cfcb49c76ceb2d68edf9075253a29ff035308f0..b4116d6c6ce053631f485425c7bb8783660a5b6e 100644 (file)
--- a/gnulib-local/modules/styled-ostream
+++ b/gnulib-local/modules/styled-ostream
@@ -25,11 +25,12 @@ styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h : styled-ostream.h
            result=$$?; rm -rf styled-ostream.lock; exit $$result; \
          else \
            while test -d styled-ostream.lock; do sleep 1; done; \
-           test -f styled-ostream.h; \
+           test -f $(srcdir)/styled-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h
-CLEANFILES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h
+MAINTAINERCLEANFILES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h
+EXTRA_DIST += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h
 
 Include:
 "styled-ostream.h"

diff --git a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
index 4b491745701aab197b10ec76f08a6959d8d47d79..fac75563369b1a1e7afc8316630da53787ae0614 100644 (file)
--- a/gnulib-local/modules/term-ostream
+++ b/gnulib-local/modules/term-ostream
@@ -36,11 +36,12 @@ term-ostream.c term_ostream.priv.h term_ostream.vt.h : term-ostream.h
            result=$$?; rm -rf term-ostream.lock; exit $$result; \
          else \
            while test -d term-ostream.lock; do sleep 1; done; \
-           test -f term-ostream.h; \
+           test -f $(srcdir)/term-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h
-CLEANFILES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h
+MAINTAINERCLEANFILES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h
+EXTRA_DIST += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h
 
 Include:
 "term-ostream.h"

diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream
index 9c980ffa52a6e5ba11892d51aa70251f9aba5a52..7a77f171e01583a4e6c1364562c42e293d016389 100644 (file)
--- a/gnulib-local/modules/term-styled-ostream
+++ b/gnulib-local/modules/term-styled-ostream
@@ -30,11 +30,12 @@ term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h : term
            result=$$?; rm -rf term-styled-ostream.lock; exit $$result; \
          else \
            while test -d term-styled-ostream.lock; do sleep 1; done; \
-           test -f term-styled-ostream.h; \
+           test -f $(srcdir)/term-styled-ostream.h; \
          fi; \
        }
 BUILT_SOURCES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h
-CLEANFILES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h
+MAINTAINERCLEANFILES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h
+EXTRA_DIST += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h
 
 Include:
 "term-styled-ostream.h"