diff options
-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 @@ -88,7 +88,7 @@ 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 @@ -83,12 +83,12 @@ m4_define([<MF_BUILTIN_MODULE>],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() * --------------- @@ -950,10 +950,10 @@ 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"); |