Mercurial > dropbear
changeset 1488:abbdeca6f1bd
Fix building default_options.h
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 11 Feb 2018 10:53:59 +0800 |
| parents | b0c3b46372dc |
| children | fdae6fae00af |
| files | Makefile.in default_options.h.in |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Feb 10 19:25:00 2018 +0800 +++ b/Makefile.in Sun Feb 11 10:53:59 2018 +0800 @@ -234,7 +234,6 @@ # default_options.h is stored in version control, could not find a workaround # for parallel "make -j" and dependency rules. default_options.h: default_options.h.in - echo "# > > > Generated from $^, edit that file instead !" > [email protected] - echo >> [email protected] - $(srcdir)/ifndef_wrapper.sh < $^ > [email protected] + echo "/*\n > > > Do not edit this file (default_options.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > [email protected] + $(srcdir)/ifndef_wrapper.sh < $^ >> [email protected] mv [email protected] $@
--- a/default_options.h.in Sat Feb 10 19:25:00 2018 +0800 +++ b/default_options.h.in Sun Feb 11 10:53:59 2018 +0800 @@ -3,12 +3,11 @@ /* > > > Read This < < < -default_options.h.in (this file) documents compile-time options, and provides -default values. +default_options.h.in documents compile-time options, and provides default values. Local customisation should be added to localoptions.h which is used if it exists. Options defined there will override any options in this -file (#ifndef guards added by ifndef_wrapper.sh). +file. Options can also be defined with -DDROPBEAR_XXX in Makefile CFLAGS