diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-11-05 11:19:23 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-11-05 11:19:23 +0200 |
commit | 29583de41d70ec5ef37e87fa1ddddc0f7a15539f (patch) | |
tree | 2d2c8763b5df90ce8f642bb99c54ba6a50e49117 | |
parent | 53d0561ca828459d280cbfa5d2b3950e133da81e (diff) | |
download | mailfromd-29583de41d70ec5ef37e87fa1ddddc0f7a15539f.tar.gz mailfromd-29583de41d70ec5ef37e87fa1ddddc0f7a15539f.tar.bz2 |
Change generation of debug names for built-in modules
* src/builtin/Makefile.am (.bi.c): Don't define SOURCE
* src/builtin/snarf.m4 (MF_SOURCE_DEBUG_NAME): Remove.
(MF_MODULE_DEBUG_NAME): New macro.
(_init_builtin): Use MF_MODULE_DEBUG_NAME
-rw-r--r-- | src/builtin/Makefile.am | 2 | ||||
-rw-r--r-- | src/builtin/snarf.m4 | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am index 7d5db661..e9ee8e20 100644 --- a/src/builtin/Makefile.am +++ b/src/builtin/Makefile.am @@ -85,11 +85,11 @@ $(BI_FILES:.bi=.c): snarf.m4 init.m4 SUFFIXES = .bi .c .def .h .mfi .mf M4=m4 .bi.c: - $(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" $(top_srcdir)/src/builtin/snarf.m4 $< > $@ + $(AM_V_GEN)$(M4) --prefix -s $(top_srcdir)/src/builtin/snarf.m4 $< > $@ .def.h: $(AM_V_GEN) $(M4) --prefix $(top_srcdir)/src/builtin/init.m4 $(BI_FILES) $< > $@ diff --git a/src/builtin/snarf.m4 b/src/builtin/snarf.m4 index 2a32b02a..acb05ed9 100644 --- a/src/builtin/snarf.m4 +++ b/src/builtin/snarf.m4 @@ -80,18 +80,18 @@ m4_pushdef([<MF_MODULE_NAME>]) */ m4_define([<MF_BUILTIN_MODULE>],m4_dnl [<m4_pushdef([<MF_MODULE_NAME>],m4_dnl m4_ifelse([<$1>],,[<m4_dnl m4_patsubst(m4___file__,\(.*/\)?\(.*\)\.bi,\2)>],[<$1>]))>])m4_dnl -/* MF_SOURCE_DEBUG_NAME(MODULE) - * ---------------------------- +/* MF_MODULE_DEBUG_NAME + * -------------------- * Expand to the "debug" name for the MODULE. */ -m4_define([<MF_SOURCE_DEBUG_NAME>],[<m4_dnl -m4_translit(m4_patsubst($1,\(.*/\)?\(.*\)\.bi,bi_\2),[<A-Z->],[<a-z_>])>]) +m4_define([<MF_MODULE_DEBUG_NAME>],[<m4_dnl +[<bi_>]m4_translit(MF_MODULE_NAME,[<A-Z->],[<a-z_>])>]) /* MF_MODULE_IDX() * --------------- * Expand to the BUILTIN_IDX_ constant for the current module. */ m4_define([<MF_MODULE_IDX>],[<m4_dnl @@ -947,16 +947,16 @@ m4_ifelse(MF_MODULE_NAME,,[<m4_errprint([<MF_BUILTIN_MODULE is missing >]) m4_m4exit(1)>]) m4_undefine([<__MF_PRIV_ID__>])m4_dnl m4_ifdef([<__MF_COND_SYMBOL>],[<#endif /[<>]* __MF_COND_SYMBOL */ >]) void -MF_MODULE_NAME()_init_builtin() +MF_MODULE_NAME()_init_builtin(void) { m4_ifdef([<__MF_DEBUG>],[<m4_dnl - debug_handle = mu_debug_register_category("MF_SOURCE_DEBUG_NAME(SOURCE)"); + debug_handle = mu_debug_register_category("MF_MODULE_DEBUG_NAME"); >]) m4_ifdef([<__MF_COND_SYMBOL>],[<#ifdef __MF_COND_SYMBOL pp_define("__MF_COND_SYMBOL"); >])m4_dnl m4_undivert(1) __MF_INIT_SEQUENCE |