subdirmk: cdeps.sd.mk: Honour &CDEPS_OBJECTS

This makes this facility more flexible.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge commit 'a1e52614e600bed8e51b461e6569f2cd263e82bb'

subdirmk: Fix bug in regen.mk.in

Apparently, if you just write `;', make knows that the command can't
have done anything.  It therefore concludes tha the target file cannot
have been updated and doesn't bother rereading it.

The result is that you end up using last run's makefiles.

Writing @: fixes this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Fix bug in regen.mk.in

Apparently, if you just write `;', make knows that the command can't
have done anything.  It therefore concludes tha the target file cannot
have been updated and doesn't bother rereading it.

The result is that you end up using last run's makefiles.

Writing @: fixes this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge commit '6fce06f32c1dd21b5c2d7a142d54b7153d650574'

subdirmk: Change stub force target to `run-main.mk'

This produces significantly better error messages:
  [some error from actual makefiles]
  make[1]: Leaving directory '/home/ian/wherever'
  Makefile:6: recipe for target 'run-main.mk' failed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Change stub force target to `run-main.mk'

This produces significantly better error messages:
  [some error from actual makefiles]
  make[1]: Leaving directory '/home/ian/wherever'
  Makefile:6: recipe for target 'run-main.mk' failed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Fix bug when target in subdir exists

If you try to make a file that exists, the % rule doesn't seem to
match.  But providing the dependency for all of $(MAKCMDGOALS)
works.

We have to mention `all' explicitly because it might not appear in
$(MAKECMDGOALS).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Fix bug when target in subdir exists

If you try to make a file that exists, the % rule doesn't seem to
match.  But providing the dependency for all of $(MAKCMDGOALS)
works.

We have to mention `all' explicitly because it might not appear in
$(MAKECMDGOALS).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: start 0.5.2~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

stest: Suppress a GCC warning (for stretch)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

finalise 0.5.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make-secnet-sites: Add test for -P option

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make-secnet-sites: Actually fix -P option (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

mtest: Provide for sedderyb

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Release checklist: mention Subdir.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Prepare 0.5.1 (more)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Prepare 0.5.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge commit 'd817b49007e60b0e7392f23caf08dc0328eb32de' into HEAD

build system: Add warning suppressions for GCC9

We suppress 4 instances like:

  udp.c:113:45: error: increment of a boolean expression [-Werror=bool-operation]
    113 |     if (us->experienced[!!dest][af][success]++)
|                                             ^~

This is a very convenient idiom (using the saturating property of
boolean addition) and there is no sensible replacement.

And we suppress 6 instances like:

  tun.c:322:6: error: 'strncpy' specified bound 16 equals destination size [-Werror=stringop-truncation]
    322 |      strncpy(ifr.ifr_name,st->interface_name,IFNAMSIZ);
|      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

All write to ifr_name.  strncpy is precisely right for this, since the
API supports non-null-terminated names of length IFNAMSIZ.  That is
why I used strncpy.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

polypath.c: Fix a compiler warning

  polypath.c:520:20: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
    520 |     *allreasonable *= reasonable;
        |                    ^~

This is not really a very helpful suggstion because there is no &&=.
Happily the compiler doesn't (currently) complain about &= which is
the same when both arguments are bools.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make-secnet-sites: sort the properties in level.output_props

This makes the test suite less sensitive to python version.
Now it works with 2.7.13, 3.5.3,, 3.7.5.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make-secnet-sites: sort the properties

This makes the test suite less sensitive to python version.
Now it works with 2.7.13, 3.5.3.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

mtest: diff: Write output files and seddery rune

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

tests: Introduce `diff' proc

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: tests: Add missing standard clean

We want (i) recursion from the parent (ii) automatic cleaning of
&CLEAN (which is set by cdeps.sd.mk, amongst other things).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Drop `check' from `all'

Otherwise there's no way to make everything but not run tets.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Do always regenerate version.o

We make two changes which affect only the litle recursive make of
version.o.  We only build version.o in the little sub-make when
relinking and then we want to always do it.  So the setting of OBJECTS
is pointless, and instead we make version.c depend on FORCE.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Fix nits following switch to subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Docs: Fix some leftover ; and ,

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Docs, go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Docs, go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Implement new syntax

But I plan to go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Implement new syntax

But I plan to go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge commit 'c0b216c79763f720df20e002fc14c9348a0e05c2'

docs: Discuss variable settings and inclusion order

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Actually clear right variable

"subdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES"
cleared MAKEFILES by mistake (this was a rebase transposition error -
this commit originally came before "subdirmk: Rename MAKEFILES
variable".

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Abolish all absolute pathname syntaxes

These are rare and make things much more confusing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Improve docs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Fill in an empty cell with a copy instead

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Transpose columns in path syntax reference

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Change . to require rather than imply @

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Further corresponding new syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: wip new syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Swap rows in syntax table

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: New plan for directory references, further

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: New plan for directory references, new

Not yet implemented.  About to simplify this...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: New plan for directory references

Not yet implemented.  About to simplify this...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Summarise directory reference syntaxes, permute

Just permute the columns which seems to be clearer.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

docs: Summarise directory reference syntaxes

This reveals it to be a bit of a mess.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

legal: Include DEVELOPER-CERTIFICATE

A symlink to subdirmk's copy.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Clarify incremental paragraph

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Clarify race lossage paragraph

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Some hints in docs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Honour CHECK_SILENT='' to print all the runes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Fix out of tree builds again

"build system: convert stest and mtest to Subdir.mk" broke this by
referring to the wrong paths.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

CREDITS: Credit Mark properly (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk

build system: ipaddrset.confirm

Make it like the others.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Use subdirmk cdeps.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Provide `check' and `fullcheck' everywhere

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Reorganise check targets

Now we don't run msgcode-test unless it's `fullcheck'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Make check targets double-colon

For compatibility with subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: convert stest and mtest to Subdir.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test-common: Cope if argv0 starts with ./

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Convert test-example to subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Use SUBDIRMK_MAKEFILES for common.make etc.

This wires them properly into regen.mk.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Do not use autoconf's `rm'

This is /bin/rm.  But make's builtin is `rm -f' which is better.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

build system: Fix automatic autoheader invocation.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Switch to using subdirmk for the top-level

We have incorporated the subdirectories yet...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES

Otherwise, if we reenter main.mk (for exmaple, there are some reasons
why one might want to $(MAKE) a particular target), and someone
foolishly said `export', we inherit SUBDIRMK_MAKEFILES from our
previous self and end up reading everything twice.  That causes things
not to work very well.

While we're here, clear MAKEFILE_TEMPLATES too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES

Otherwise, if we reenter main.mk (for exmaple, there are some reasons
why one might want to $(MAKE) a particular target), and someone
foolishly said `export', we inherit SUBDIRMK_MAKEFILES from our
previous self and end up reading everything twice.  That causes things
not to work very well.

While we're here, clear MAKEFILE_TEMPLATES too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Rename MAKEFILES variable

This is very magic to make and the behaviour is very undesirable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Rename MAKEFILES variable

This is very magic to make and the behaviour is very undesirable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Honour CONFIG_STATUS_OUTPUTS

Principally to support autoheader.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Honour CONFIG_STATUS_OUTPUTS

Principally to support autoheader.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Make \& work (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

subdirmk: Make \& work (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Add 'subdirmk/' from commit 'f1789a0ae66174a95c8d629738eae98d40c084ac'

git-subtree-dir: subdirmk
git-subtree-mainline: d212a384b4ef631a876e1ddd3e52fd09e4b1f484
git-subtree-split: f1789a0ae66174a95c8d629738eae98d40c084ac

Two minor docs fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Drop AC_PROG_INSTALL and remove build-aux/install-sh from example

This is just deadweight.  It's rather poor practice too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test regeneration after a -included .in file changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test regeneration after a &:-included file (ie a .sd.mk) changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Tests: use set -x

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix docs typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

tests/check: New test script, quite basic

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Transpose directories

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Documentation for regen.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

realclean: Use @_SUBDIRMK_MAKEFILES@

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Drop Perdir.sd.mk from explicit MAKEFILE_TEMPLATES

generate does this itself now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Documentation for usual.mk.in

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Documentation for clean.sd.mk and cdeps.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Move knowledge of DEPFILES into cdeps.sd.mk

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Introduce CDEPS_CFLAGS so without cdeps.sd.mk you don't get .*.d

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

New &# feature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

More docs updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Merge branch 'master' of https://git.distorted.org.uk/~markw/subdirmk

subdirmk/*: Some simple whitespace cleanups

Zap trailing whitespace, and spaces-followed-by-tabs.  This commit is
empty in `git show -b'.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>