diff options
| author | Eric Blake <ebb9@byu.net> | 2010-01-07 10:25:33 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-02-24 13:47:38 -0700 |
| commit | 2bedb20e510295151457d8759bcd1e34d97af561 (patch) | |
| tree | 41768ded4a254dc9062d36d92860c5670978674c | |
| parent | 8b8afe81fe7dbda9cf1dea6c18a1b4d56e871c7e (diff) | |
| download | m4-2bedb20e510295151457d8759bcd1e34d97af561.tar.gz | |
Document upcoming release.
* gnulib: Update to latest.
* doc/m4.texinfo (History): Mention 1.4.14.
* Makefile.am (src/getopt.h): Drop dependence on now-obsolete
link-warning.h.
Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit d0489f2a57e649b22f719ed8670ca3733c4febd4)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| m--------- | gnulib | 0 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2010-01-29 Eric Blake <ebb9@byu.net> + + Document upcoming release. + * gnulib: Update to latest. + * doc/m4.texinfo (History): Mention 1.4.14. + * Makefile.am (src/getopt.h): Drop dependence on now-obsolete + link-warning.h. + 2010-01-08 Eric Blake <ebb9@byu.net> Address remaining 'make syntax-check' findings. diff --git a/Makefile.am b/Makefile.am index ecba57ff..16e2be9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,19 +116,17 @@ BUILT_SOURCES += src/$(GETOPT_H) endif EXTRA_DIST += src/getopt.c src/getopt1.c src/getopt.in.h src/getopt_int.h -LINK_WARNING_H = $(srcdir)/$(config_aux_dir)/link-warning.h ARG_NONNULL_H = $(srcdir)/$(config_aux_dir)/arg-nonnull.h # We need the following in order to create an <getopt.h> when the # system doesn't have one that works with the given compiler. -src/getopt.h: src/getopt.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H) +src/getopt.h: src/getopt.in.h $(ARG_NONNULL_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ - -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ < $(srcdir)/src/getopt.in.h; \ } > $@-t && \ diff --git a/gnulib b/gnulib -Subproject c535f4489b41f28afd115ae331d69595ea41b6a +Subproject 6c53c9025551ed72e7011f8de83aca2639bc5bf |