diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/builtin/Makefile.am | 15 | ||||
| -rw-r--r-- | src/builtin/indent.pro | 36 | ||||
| -rw-r--r-- | src/builtin/snarf.m4 | 2 |
3 files changed, 4 insertions, 49 deletions
diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am index bf61f163..7d5db661 100644 --- a/src/builtin/Makefile.am +++ b/src/builtin/Makefile.am @@ -64,8 +64,7 @@ EXTRA_DIST = \ builtin.def\ builtin.h\ init.m4\ - snarf.m4\ - indent.pro + snarf.m4 BUILT_SOURCES=\ $(BI_FILES:.bi=.c)\ @@ -88,17 +87,9 @@ SUFFIXES = .bi .c .def .h .mfi .mf M4=m4 -if COND_GNU_INDENT - REINDENT = | INDENT_PROFILE=$(srcdir)/indent.pro $(INDENT) -else - REINDENT = -endif - .bi.c: - $(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" \ - $(srcdir)/snarf.m4 $< $(REINDENT) > $@ + $(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" $(top_srcdir)/src/builtin/snarf.m4 $< > $@ .def.h: - $(AM_V_GEN) $(M4) --prefix \ - $(srcdir)/init.m4 $(BI_FILES) $< $(REINDENT) > $@ + $(AM_V_GEN) $(M4) --prefix $(top_srcdir)/src/builtin/init.m4 $(BI_FILES) $< > $@ diff --git a/src/builtin/indent.pro b/src/builtin/indent.pro deleted file mode 100644 index 45ac512e..00000000 --- a/src/builtin/indent.pro +++ /dev/null @@ -1,36 +0,0 @@ -// GNU indent options for formatting files generated -*- fundamental -*- -// from MFL .bi sources. --nbad // don't force blank line after every block of declarations --bap // force blank line after every procedure body --nbc // don't force newline after each comma in declaration --bbo // break long lines before boolean operators --hnl // honour (original) newlines --br // retain braces on the same line with the conditional --brs // retain braces on the same line with struct definitions --c33 // column number for comments following the code --cd33 // column number for comments following the declaration --ncdb // don't place comment delimiters on blank lines --ce // 'else' remains on the same line with '}' --ci4 // indent level for subsequent lines of a split statement --cli0 // case label indent --d0 // align separate comments with the enclosing code --di1 // place identifiers in a declaration in a first available position --nfc1 // don't format comments that begin in column 1 --i8 // default indentation offset --ip0 // indentation for old-style parameter declarations --l80 // line length --lp // align continuation parameters with the open parenthesis --npcs // don't place a space between function name and opening quote --nprs // don't delimit parenteses with spaces --psl // place type of the function on a separate line --sai // space between 'if' and '(' --saf // space between 'for' and '(' --saw // space between 'while' and '(' --ncs // don't force a space after a cast --nsc // don't insert asteriscs into multi-line comments --sob // swallow optional blank lines --nfca // don't format comments starting after the 1st column --cp33 // indentation for comments following a preprocessor directive --ss // force a newline between 'for (;;)' and ';' --ts8 // tabspaces are placed at each 8th column --il1 // offset for labels diff --git a/src/builtin/snarf.m4 b/src/builtin/snarf.m4 index 7eb7458c..2a32b02a 100644 --- a/src/builtin/snarf.m4 +++ b/src/builtin/snarf.m4 @@ -950,7 +950,7 @@ m4_undefine([<__MF_PRIV_ID__>])m4_dnl m4_ifdef([<__MF_COND_SYMBOL>],[<#endif /[<>]* __MF_COND_SYMBOL */ >]) void -MF_MODULE_NAME()_init_builtin(void) +MF_MODULE_NAME()_init_builtin() { m4_ifdef([<__MF_DEBUG>],[<m4_dnl debug_handle = mu_debug_register_category("MF_SOURCE_DEBUG_NAME(SOURCE)"); |