From f05bbd1ccf374e8efce25b686b8760b9309cf314 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 9 Mar 2004 15:14:11 +0000 Subject: * src/Makefile.am (mkerrcodes.h): Let CPP work on a temporary file. (CLEANFILES): Add that temporary file. * configure.ac (AC_PROG_CPP): Added. * src/err-codes.h.in: Removed trailing spaces from GPG_ERR_NOT_LOCKED. --- src/Makefile.am | 11 ++++++++--- src/err-codes.h.in | 2 +- src/err-sources.h.in | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4f333df..e67d49f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,11 +25,15 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ mkheader.awk gpg-error.h.in \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 + BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h + +tmp_files = _mkerrcodes.h + CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ gpg-error.h mkerrcodes mkerrcodes.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h + err-sources-sym.h err-codes-sym.h errnos-sym.h $(tmp_files) bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal @@ -72,8 +76,9 @@ code-to-errno.h: Makefile mkerrnos.awk errnos.in # It is correct to use $(CPP). We want the host's idea of the error codes. mkerrcodes.h: Makefile mkerrcodes.awk - $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in \ - | $(CPP) - | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ + $(CPP) _$@ | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + -rm _$@ # It is correct to use $(CC_FOR_BUILD) here. We want to run the # program at build time. diff --git a/src/err-codes.h.in b/src/err-codes.h.in index b70faea..e05b6f8 100644 --- a/src/err-codes.h.in +++ b/src/err-codes.h.in @@ -196,7 +196,7 @@ 164 GPG_ERR_INV_CERT_OBJ Invalid certificate object 165 GPG_ERR_UNKNOWN_NAME Unknown name 166 GPG_ERR_LOCALE_PROBLEM A locale function failed -167 GPG_ERR_NOT_LOCKED Not locked +167 GPG_ERR_NOT_LOCKED Not locked # 168 to 199 are free to be used. diff --git a/src/err-sources.h.in b/src/err-sources.h.in index af072bd..9af23fd 100644 --- a/src/err-sources.h.in +++ b/src/err-sources.h.in @@ -40,6 +40,7 @@ 8 GPG_ERR_SOURCE_KEYBOX Keybox 9 GPG_ERR_SOURCE_KSBA KSBA 10 GPG_ERR_SOURCE_DIRMNGR Dirmngr +11 GPG_ERR_SOURCE_GSTI GSTI # 11 to 31 are free to be used. -- cgit v1.2.3