diff options
| author | Marcus Brinkmann <[email protected]> | 2012-02-14 12:03:46 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-02-14 12:34:44 +0000 |
| commit | 885243e05467e79e2375b3febe7904053ab45dfc (patch) | |
| tree | 2eb90674c28bf54126beb7c4e1e1d11f016066c9 /src/Makefile.am | |
| parent | Use gpgme interface for error handling to avoid linking with gpg-error. (diff) | |
| download | gpgme-885243e05467e79e2375b3febe7904053ab45dfc.tar.gz gpgme-885243e05467e79e2375b3febe7904053ab45dfc.zip | |
Rework status table to be less dynamically generated.
* src/Makefile.am (EXTRA_DIST): Remove mkstatus.
(BUILT_SOURCE, MOSTLYCLEANFILES): Remove.
(main_sources): Remove status-table.h, extra-stati.h.
Add status-table.c.
(status-table.h): Remove rules for built source.
* src/decrypt.c: Don't include extra-stati.h.
* src/engine-gpg.c: Don't include status-table.h.
(status_cmp): Remove function.
(read_status): Use _gpgme_parse_status.
* src/engine-gpgsm.c: Don't include status-table.h.
(status_cmp, parse_status): Remove function.
(gpgsm_assuan_simple_command, status_handler): Use _gpgme_parse_status.
* src/engine-uiserver.c: Don't include status-table.h.
(status_cmp, parse_status): Remove function.
(uiserver_assuan_simple_command, status_handler): Use
_gpgme_parse_status.
* src/gpgme.h.in (gpgme_status_code_t): Add
GPGME_STATUS_DECRYPTION_INFO.
* src/util.h (_gpgme_status_init,_gpgme_parse_status): New declaration.
* src/status-table.c: New file.
* src/extra-stati.h, src/mkstatus: Files removed.
* version.c (do_subsystem_inits): Call _gpgme_status_init.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e456d805..ea8e70eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,11 +19,9 @@ ## Process this file with automake to produce Makefile.in # Note: moc_kdpipeiodevice should actually be a dependcy below. -EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers ChangeLog-2011 \ +EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp -BUILT_SOURCES = status-table.h -MOSTLYCLEANFILES = status-table.h bin_SCRIPTS = gpgme-config m4datadir = $(datadir)/aclocal m4data_DATA = gpgme.m4 @@ -115,8 +113,7 @@ main_sources = \ key.c keylist.c trust-item.c trustlist.c \ import.c export.c genkey.c delete.c edit.c getauditlog.c \ opassuan.c passwd.c \ - engine.h engine-backend.h engine.c engine-gpg.c status-table.h \ - extra-stati.h \ + engine.h engine-backend.h engine.c engine-gpg.c status-table.c \ $(gpgsm_components) $(assuan_components) $(gpgconf_components) \ $(uiserver_components) \ $(g13_components) vfs-mount.c vfs-create.c \ @@ -228,10 +225,6 @@ endif noinst_PROGRAMS = gpgme-tool gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ -status-table.h : gpgme.h extra-stati.h - cat $(builddir)/gpgme.h $(srcdir)extra-stati.h \ - | $(srcdir)/mkstatus > status-table.h - install-data-local: install-def-file uninstall-local: uninstall-def-file |