Namespace normalization (2). Provide installable headers.

* Makefile.am (SUBDIRS): Add include.
* configure.ac: Build include/*/Makefile
Set-up grecs as a shared convenience library. Install
its headers.
* include/Makefile.am: New file.
* include/wydawca/Makefile.am: New file.
* include/wydawca/cfg.h: New file.
* include/wydawca/wydawca.h: New file.
* modules/mailutils/Makefile.am (AM_CPPFLAGS): Add include/
* src/Makefile.am (LDADD): Use @GRECS_LDADD@
(AM_CPPFLAGS): Add include/.
* tests/Makefile.am: Likewise.
* src/wydawca.h: Include wydawca/wydawca.h.
(__cat2__, __cat3__): Move to installable header and rename.
(struct wy_user): Move to installable header.
(struct file_triplet): Rename to wy_triplet. All uses changed.
(enum notification_event): Rename to wy_event and move to
installable header.
(struct metadef): Rename to wy_metadef and move to
installable header.
(dry_run_mode): Rename to wy_dry_run and move to
installable header.
(wydawca_gpg_homedir): Rename to wy_gpg_homedir and move to
installable header.
(wy_version, wy_debug_level, wy_log_to_stderr)
(wy_log_facility, wy_syslog_tag)
(wy_log,wy_dbg): Move to installable header.

* modules/mailutils/mod_mailutils.c: Update.
* src/cmdline.opt
* src/config.c
* src/directive.c
* src/diskio.c
* src/event.c
* src/gpg.c
* src/job.c
* src/meta.c
* src/module.c
* src/null.c
* src/timer.c
* src/triplet.c
* src/verify.c
* src/vtab.c
* src/watcher.c
* src/wydawca.c

18 files changed, 268 insertions, 288 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b350e5..c4be551 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,8 +67,9 @@ SUFFIXES=.opt .c .h
 incdir=$(pkgdatadir)/$(VERSION)/include
 inc_DATA = $(PP_SETUP_FILE)
 
-LDADD=../grecs/src/libgrecs.a @SQLLIB@ @GPGMELIB@ @LIBLTDL@
+LDADD=@GRECS_LDADD@ @SQLLIB@ @GPGMELIB@ @LIBLTDL@
 AM_CPPFLAGS= \
+ -I$(top_srcdir)/include\
  -I$(top_srcdir)/grecs/src/ @MAILUTILS_INCLUDES@\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DLOCALSTATEDIR=\"$(localstatedir)\"\
diff --git a/src/cmdline.opt b/src/cmdline.opt
index ef89222..039dc6b 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -69,7 +69,7 @@ OPTION(dry-run,n,,
 BEGIN
         wy_log_to_stderr = 1;
         wy_debug_level++;
-        dry_run_mode = 1;
+        wy_dry_run = 1;
 END
 
 OPTION(cron,,,
diff --git a/src/config.c b/src/config.c
index b89beff..eef4ee1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,5 @@
 /* wydawca - automatic release submission daemon
-   Copyright (C) 2007-2012 Sergey Poznyakoff
+   Copyright (C) 2007-2013 Sergey Poznyakoff
 
    Wydawca is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -205,17 +205,17 @@ safe_file_name_alloc(const char *file_name)
 }
 
 static struct keyword event_tab[] = {
-        { "success",                 ev_success },
-        { "bad-ownership",           ev_bad_ownership },
-        { "bad-directive-signature", ev_bad_directive_signature },
-        { "bad-detached-signature",  ev_bad_detached_signature },
-        { "check-failure",           ev_check_fail },
-        { "statistics",              ev_statistics },
+        { "success",                 wy_ev_success },
+        { "bad-ownership",           wy_ev_bad_ownership },
+        { "bad-directive-signature", wy_ev_bad_directive_signature },
+        { "bad-detached-signature",  wy_ev_bad_detached_signature },
+        { "check-failure",           wy_ev_check_fail },
+        { "statistics",              wy_ev_statistics },
         {NULL}
 };
 
 const char *
-notification_event_str(enum notification_event evt)
+wy_event_str(enum wy_event evt)
 {
         const char *ret;
         if (tok_to_keyword(evt, event_tab, &ret)) {
@@ -229,8 +229,8 @@ notification_event_str(enum notification_event evt)
 }
 
 int
-string_to_notification_event(grecs_locus_t *locus, const char *val,
-                             enum notification_event *pret)
+string_to_wy_event(grecs_locus_t *locus, const char *val,
+                             enum wy_event *pret)
 {
         int res;
         if (keyword_to_tok(val, event_tab, &res)) {
@@ -717,13 +717,13 @@ static int
 cb_event(enum grecs_callback_command cmd, grecs_node_t *node,
          void *varptr, void *cb_data)
 {
-        enum notification_event *pev = varptr;
+        enum wy_event *pev = varptr;
         grecs_locus_t *locus = &node->locus;
         grecs_value_t *value = node->v.value;
 
         if (wy_assert_string_arg(locus, cmd, value))
                 return 1;
-        string_to_notification_event(&value->locus, value->v.string, pev);
+        string_to_wy_event(&value->locus, value->v.string, pev);
         return 0;
 }
 
@@ -1334,7 +1334,7 @@ static struct grecs_keyword wydawca_kw[] = {
           grecs_type_string, GRECS_LIST, &all_spool_aliases },
 
         { "gpg-homedir", NULL, N_("GPG home directory"),
-          grecs_type_string, GRECS_DFLT, &wydawca_gpg_homedir },
+          grecs_type_string, GRECS_DFLT, &wy_gpg_homedir },
 
         {NULL}
 };
diff --git a/src/directive.c b/src/directive.c
index 481e267..c7e1817 100644
--- a/src/directive.c
+++ b/src/directive.c
@@ -20,7 +20,7 @@
 
 /* Parse directives from TRP->blurb. Fill TRP->directive */
 int
-directive_parse(struct file_triplet *trp)
+directive_parse(struct wy_triplet *trp)
 {
         size_t dcount, i, j;
         char *p;
@@ -61,7 +61,7 @@ directive_parse(struct file_triplet *trp)
 /* If a directive KEY exists in the triplet TRP, return 0 and point PVAL
    (unless it is NULL) to its value. Othervise, return 1. */
 int
-directive_get_value(struct file_triplet *trp, const char *key,
+directive_get_value(struct wy_triplet *trp, const char *key,
                     const char **pval)
 {
         int keylen = strlen(key);
@@ -94,7 +94,7 @@ directive_get_value(struct file_triplet *trp, const char *key,
 
      If N points past all the directive, the function returns 0. */
 static int
-_directive_seq_get(int n, struct file_triplet *trp,
+_directive_seq_get(int n, struct wy_triplet *trp,
                    const char **pkey, const char **pval)
 {
         char *p;
@@ -121,7 +121,7 @@ _directive_seq_get(int n, struct file_triplet *trp,
 /* Get the first directive from TRP. Point *PKEY to its keyword and
    *PVAL to its value. Return 1 on success, 0 on failure. */
 int
-directive_first(struct file_triplet *trp, const char **pkey, const char **pval)
+directive_first(struct wy_triplet *trp, const char **pkey, const char **pval)
 {
         int n = 0;
         return _directive_seq_get(n, trp, pkey, pval);
@@ -131,7 +131,7 @@ directive_first(struct file_triplet *trp, const char **pkey, const char **pval)
    *PVAL to its value. Return 1 on success, 0 on failure.
    Return non-0 on success, 0 on failure */
 int
-directive_next(struct file_triplet *trp, int n,
+directive_next(struct wy_triplet *trp, int n,
                const char **pkey, const char **pval)
 {
         return _directive_seq_get(n, trp, pkey, pval);
@@ -166,7 +166,7 @@ directive_unpack_version(unsigned version, char **pbuf, size_t * psize)
 /* Return true if the directory file version of the triplet TRP
    is within the inclusive range FROM and TO (packed) */
 int
-directive_version_in_range_p(struct file_triplet *trp,
+directive_version_in_range_p(struct wy_triplet *trp,
                              unsigned from, unsigned to)
 {
         const char *val;
@@ -238,7 +238,7 @@ find_directive(const char *key)
 
 /* Return 0 if the directory file format of the triplet TRP is OK. */
 int
-verify_directive_format(struct file_triplet *trp)
+verify_directive_format(struct wy_triplet *trp)
 {
         int n, dnum;
         const char *key;
@@ -387,7 +387,7 @@ stderr_redirector(const char *tag)
 }
 
 static int
-run_check_script(const char *script, struct file_triplet *trp,
+run_check_script(const char *script, struct wy_triplet *trp,
                  const char *descr)
 {
         static char *script_file;
@@ -527,7 +527,7 @@ run_check_script(const char *script, struct file_triplet *trp,
 }