[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
minor gettext nits
From: |
Ralf Wildenhues |
Subject: |
minor gettext nits |
Date: |
Sun, 14 Sep 2008 09:45:16 +0200 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
Hello Bruno,
I found these small changes helpful for CVS gettext.
The am__dirstamp is to avoid parallel build failure.
It relies on an undocumented automake macro name.
If that disturbs you, then we can either document it,
or use another rule that invokes $(mkdir_p) rather than
plain mkdir. That's still efficient, and parallel-safe.
Cheers, and thanks for maintaining gettext,
Ralf
gettext-tools/ChangeLog:
2008-09-14 Ralf Wildenhues <address@hidden>
* configure.ac: Use AC_TYPE_UNSIGNED_LONG_LONG_INT instead of
gl_AC_TYPE_UNSIGNED_LONG_LONG.
gettext-tools/src/ChangeLog:
2008-09-14 Ralf Wildenhues <address@hidden>
* xgettext.c: Include concat-filename.h, for
concatenated_filename.
gnulib-local/ChangeLog:
2008-09-14 Ralf Wildenhues <address@hidden>
* modules/libglib: For all generated headers, depend on
glib/$(am__dirstamp) rather than calling mkdir, to be safe for
parallel make.
* modules/libxml: Likewise, with libxml/$(am__dirstamp).
Index: gettext-tools/configure.ac
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-tools/configure.ac,v
retrieving revision 1.97
diff -u -r1.97 configure.ac
--- gettext-tools/configure.ac 17 Aug 2008 09:51:31 -0000 1.97
+++ gettext-tools/configure.ac 14 Sep 2008 07:44:18 -0000
@@ -153,7 +153,7 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
-gl_AC_TYPE_UNSIGNED_LONG_LONG
+AC_TYPE_UNSIGNED_LONG_LONG_INT
AC_TYPE_SIZE_T
AC_CHECK_TYPES(ptrdiff_t)
gt_TYPE_SSIZE_T
Index: gettext-tools/src/xgettext.c
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-tools/src/xgettext.c,v
retrieving revision 1.94
diff -u -r1.94 xgettext.c
--- gettext-tools/src/xgettext.c 20 Apr 2008 05:23:52 -0000 1.94
+++ gettext-tools/src/xgettext.c 14 Sep 2008 07:44:19 -0000
@@ -49,6 +49,7 @@
#include "c-strstr.h"
#include "xerror.h"
#include "filename.h"
+#include "concat-filename.h"
#include "c-strcase.h"
#include "open-catalog.h"
#include "read-catalog-abstract.h"
Index: gnulib-local/modules/libglib
===================================================================
RCS file: /cvsroot/gettext/gettext/gnulib-local/modules/libglib,v
retrieving revision 1.4
diff -u -r1.4 libglib
--- gnulib-local/modules/libglib 4 Oct 2007 22:32:45 -0000 1.4
+++ gnulib-local/modules/libglib 14 Sep 2008 07:44:19 -0000
@@ -57,43 +57,37 @@
} > address@hidden
mv -f address@hidden $@
-glib/ghash.h: glib/ghash.in.h
- test -d glib || mkdir glib
+glib/ghash.h: glib/ghash.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/ghash.in.h; \
} > address@hidden
mv -f address@hidden $@
-glib/glist.h: glib/glist.in.h
- test -d glib || mkdir glib
+glib/glist.h: glib/glist.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/glist.in.h; \
} > address@hidden
mv -f address@hidden $@
-glib/gprimes.h: glib/gprimes.in.h
- test -d glib || mkdir glib
+glib/gprimes.h: glib/gprimes.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/gprimes.in.h; \
} > address@hidden
mv -f address@hidden $@
-glib/gstrfuncs.h: glib/gstrfuncs.in.h
- test -d glib || mkdir glib
+glib/gstrfuncs.h: glib/gstrfuncs.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/gstrfuncs.in.h; \
} > address@hidden
mv -f address@hidden $@
-glib/gstring.h: glib/gstring.in.h
- test -d glib || mkdir glib
+glib/gstring.h: glib/gstring.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/gstring.in.h; \
} > address@hidden
mv -f address@hidden $@
-glib/gtypes.h: glib/gtypes.in.h
- test -d glib || mkdir glib
+glib/gtypes.h: glib/gtypes.in.h glib/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/glib/gtypes.in.h; \
} > address@hidden
Index: gnulib-local/modules/libxml
===================================================================
RCS file: /cvsroot/gettext/gettext/gnulib-local/modules/libxml,v
retrieving revision 1.8
diff -u -r1.8 libxml
--- gnulib-local/modules/libxml 26 Oct 2007 09:32:36 -0000 1.8
+++ gnulib-local/modules/libxml 14 Sep 2008 07:44:19 -0000
@@ -163,330 +163,283 @@
BUILT_SOURCES += $(LIBXML_H)
-libxml/DOCBparser.h: libxml/DOCBparser.in.h
- test -d libxml || mkdir libxml
+libxml/DOCBparser.h: libxml/DOCBparser.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/DOCBparser.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/HTMLparser.h: libxml/HTMLparser.in.h
- test -d libxml || mkdir libxml
+libxml/HTMLparser.h: libxml/HTMLparser.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/HTMLparser.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/HTMLtree.h: libxml/HTMLtree.in.h
- test -d libxml || mkdir libxml
+libxml/HTMLtree.h: libxml/HTMLtree.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/HTMLtree.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/SAX.h: libxml/SAX.in.h
- test -d libxml || mkdir libxml
+libxml/SAX.h: libxml/SAX.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/SAX.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/SAX2.h: libxml/SAX2.in.h
- test -d libxml || mkdir libxml
+libxml/SAX2.h: libxml/SAX2.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/SAX2.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/c14n.h: libxml/c14n.in.h
- test -d libxml || mkdir libxml
+libxml/c14n.h: libxml/c14n.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/c14n.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/catalog.h: libxml/catalog.in.h
- test -d libxml || mkdir libxml
+libxml/catalog.h: libxml/catalog.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/catalog.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/chvalid.h: libxml/chvalid.in.h
- test -d libxml || mkdir libxml
+libxml/chvalid.h: libxml/chvalid.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/chvalid.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/debugXML.h: libxml/debugXML.in.h
- test -d libxml || mkdir libxml
+libxml/debugXML.h: libxml/debugXML.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/debugXML.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/dict.h: libxml/dict.in.h
- test -d libxml || mkdir libxml
+libxml/dict.h: libxml/dict.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/dict.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/encoding.h: libxml/encoding.in.h
- test -d libxml || mkdir libxml
+libxml/encoding.h: libxml/encoding.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/encoding.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/entities.h: libxml/entities.in.h
- test -d libxml || mkdir libxml
+libxml/entities.h: libxml/entities.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/entities.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/globals.h: libxml/globals.in.h
- test -d libxml || mkdir libxml
+libxml/globals.h: libxml/globals.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/globals.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/hash.h: libxml/hash.in.h
- test -d libxml || mkdir libxml
+libxml/hash.h: libxml/hash.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/hash.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/list.h: libxml/list.in.h
- test -d libxml || mkdir libxml
+libxml/list.h: libxml/list.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/list.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/nanoftp.h: libxml/nanoftp.in.h
- test -d libxml || mkdir libxml
+libxml/nanoftp.h: libxml/nanoftp.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/nanoftp.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/nanohttp.h: libxml/nanohttp.in.h
- test -d libxml || mkdir libxml
+libxml/nanohttp.h: libxml/nanohttp.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/nanohttp.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/parser.h: libxml/parser.in.h
- test -d libxml || mkdir libxml
+libxml/parser.h: libxml/parser.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/parser.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/parserInternals.h: libxml/parserInternals.in.h
- test -d libxml || mkdir libxml
+libxml/parserInternals.h: libxml/parserInternals.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/parserInternals.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/pattern.h: libxml/pattern.in.h
- test -d libxml || mkdir libxml
+libxml/pattern.h: libxml/pattern.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/pattern.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/relaxng.h: libxml/relaxng.in.h
- test -d libxml || mkdir libxml
+libxml/relaxng.h: libxml/relaxng.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/relaxng.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/schemasInternals.h: libxml/schemasInternals.in.h
- test -d libxml || mkdir libxml
+libxml/schemasInternals.h: libxml/schemasInternals.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/schemasInternals.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/schematron.h: libxml/schematron.in.h
- test -d libxml || mkdir libxml
+libxml/schematron.h: libxml/schematron.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/schematron.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/threads.h: libxml/threads.in.h
- test -d libxml || mkdir libxml
+libxml/threads.h: libxml/threads.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/threads.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/tree.h: libxml/tree.in.h
- test -d libxml || mkdir libxml
+libxml/tree.h: libxml/tree.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/tree.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/uri.h: libxml/uri.in.h
- test -d libxml || mkdir libxml
+libxml/uri.h: libxml/uri.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/uri.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/valid.h: libxml/valid.in.h
- test -d libxml || mkdir libxml
+libxml/valid.h: libxml/valid.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/valid.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xinclude.h: libxml/xinclude.in.h
- test -d libxml || mkdir libxml
+libxml/xinclude.h: libxml/xinclude.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xinclude.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xlink.h: libxml/xlink.in.h
- test -d libxml || mkdir libxml
+libxml/xlink.h: libxml/xlink.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xlink.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlIO.h: libxml/xmlIO.in.h
- test -d libxml || mkdir libxml
+libxml/xmlIO.h: libxml/xmlIO.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlIO.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlautomata.h: libxml/xmlautomata.in.h
- test -d libxml || mkdir libxml
+libxml/xmlautomata.h: libxml/xmlautomata.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlautomata.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlerror.h: libxml/xmlerror.in.h
- test -d libxml || mkdir libxml
+libxml/xmlerror.h: libxml/xmlerror.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlerror.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlexports.h: libxml/xmlexports.in.h
- test -d libxml || mkdir libxml
+libxml/xmlexports.h: libxml/xmlexports.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlexports.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlmemory.h: libxml/xmlmemory.in.h
- test -d libxml || mkdir libxml
+libxml/xmlmemory.h: libxml/xmlmemory.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlmemory.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlmodule.h: libxml/xmlmodule.in.h
- test -d libxml || mkdir libxml
+libxml/xmlmodule.h: libxml/xmlmodule.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlmodule.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlreader.h: libxml/xmlreader.in.h
- test -d libxml || mkdir libxml
+libxml/xmlreader.h: libxml/xmlreader.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlreader.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlregexp.h: libxml/xmlregexp.in.h
- test -d libxml || mkdir libxml
+libxml/xmlregexp.h: libxml/xmlregexp.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlregexp.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlsave.h: libxml/xmlsave.in.h
- test -d libxml || mkdir libxml
+libxml/xmlsave.h: libxml/xmlsave.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlsave.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlschemas.h: libxml/xmlschemas.in.h
- test -d libxml || mkdir libxml
+libxml/xmlschemas.h: libxml/xmlschemas.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlschemas.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlschemastypes.h: libxml/xmlschemastypes.in.h
- test -d libxml || mkdir libxml
+libxml/xmlschemastypes.h: libxml/xmlschemastypes.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlschemastypes.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlstring.h: libxml/xmlstring.in.h
- test -d libxml || mkdir libxml
+libxml/xmlstring.h: libxml/xmlstring.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlstring.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlunicode.h: libxml/xmlunicode.in.h
- test -d libxml || mkdir libxml
+libxml/xmlunicode.h: libxml/xmlunicode.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlunicode.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlversion.h: libxml/xmlversion.in.h
- test -d libxml || mkdir libxml
+libxml/xmlversion.h: libxml/xmlversion.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlversion.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xmlwriter.h: libxml/xmlwriter.in.h
- test -d libxml || mkdir libxml
+libxml/xmlwriter.h: libxml/xmlwriter.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xmlwriter.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xpath.h: libxml/xpath.in.h
- test -d libxml || mkdir libxml
+libxml/xpath.h: libxml/xpath.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xpath.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xpathInternals.h: libxml/xpathInternals.in.h
- test -d libxml || mkdir libxml
+libxml/xpathInternals.h: libxml/xpathInternals.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xpathInternals.in.h; \
} > address@hidden
mv -f address@hidden $@
-libxml/xpointer.h: libxml/xpointer.in.h
- test -d libxml || mkdir libxml
+libxml/xpointer.h: libxml/xpointer.in.h libxml/$(am__dirstamp)
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/libxml/xpointer.in.h; \
} > address@hidden
- minor gettext nits,
Ralf Wildenhues <=