chiark / gitweb /
secnet.git
4 years agoRelease checklist: mention Subdir.sd.mk
Ian Jackson [Fri, 22 Nov 2019 22:32:28 +0000 (22:32 +0000)]
Release checklist: mention Subdir.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Prepare 0.5.1 (more)
Ian Jackson [Fri, 22 Nov 2019 22:13:07 +0000 (22:13 +0000)]
changelog: Prepare 0.5.1 (more)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Prepare 0.5.1
Ian Jackson [Thu, 21 Nov 2019 01:01:23 +0000 (01:01 +0000)]
changelog: Prepare 0.5.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMerge commit 'd817b49007e60b0e7392f23caf08dc0328eb32de' into HEAD
Ian Jackson [Fri, 22 Nov 2019 22:30:32 +0000 (22:30 +0000)]
Merge commit 'd817b49007e60b0e7392f23caf08dc0328eb32de' into HEAD

4 years agobuild system: Add warning suppressions for GCC9
Ian Jackson [Tue, 19 Nov 2019 00:42:31 +0000 (00:42 +0000)]
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>
4 years agopolypath.c: Fix a compiler warning
Ian Jackson [Tue, 19 Nov 2019 01:16:29 +0000 (01:16 +0000)]
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>
4 years agomake-secnet-sites: sort the properties in level.output_props
Ian Jackson [Tue, 19 Nov 2019 01:03:44 +0000 (01:03 +0000)]
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>
4 years agomake-secnet-sites: sort the properties
Ian Jackson [Tue, 19 Nov 2019 00:54:58 +0000 (00:54 +0000)]
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>
4 years agomtest: diff: Write output files and seddery rune
Ian Jackson [Tue, 19 Nov 2019 00:51:10 +0000 (00:51 +0000)]
mtest: diff: Write output files and seddery rune

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotests: Introduce `diff' proc
Ian Jackson [Tue, 19 Nov 2019 00:49:54 +0000 (00:49 +0000)]
tests: Introduce `diff' proc

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: tests: Add missing standard clean
Ian Jackson [Tue, 19 Nov 2019 01:04:47 +0000 (01:04 +0000)]
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>
4 years agobuild system: Drop `check' from `all'
Ian Jackson [Fri, 15 Nov 2019 22:59:58 +0000 (22:59 +0000)]
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>
4 years agobuild system: Do always regenerate version.o
Ian Jackson [Fri, 15 Nov 2019 22:56:34 +0000 (22:56 +0000)]
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>
4 years agobuild system: Fix nits following switch to subdirmk
Ian Jackson [Fri, 15 Nov 2019 22:37:12 +0000 (22:37 +0000)]
build system: Fix nits following switch to subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDocs: Fix some leftover ; and ,
Ian Jackson [Thu, 14 Nov 2019 20:23:27 +0000 (20:23 +0000)]
Docs: Fix some leftover ; and ,

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Docs, go back to ^ and ~
Ian Jackson [Thu, 14 Nov 2019 19:45:50 +0000 (19:45 +0000)]
subdirmk: Docs, go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Docs, go back to ^ and ~
Ian Jackson [Thu, 14 Nov 2019 19:45:50 +0000 (19:45 +0000)]
subdirmk: Docs, go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Go back to ^ and ~
Ian Jackson [Thu, 14 Nov 2019 19:40:59 +0000 (19:40 +0000)]
subdirmk: Go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Go back to ^ and ~
Ian Jackson [Thu, 14 Nov 2019 19:40:59 +0000 (19:40 +0000)]
subdirmk: Go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Implement new syntax
Ian Jackson [Thu, 14 Nov 2019 19:36:39 +0000 (19:36 +0000)]
subdirmk: Implement new syntax

But I plan to go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Implement new syntax
Ian Jackson [Thu, 14 Nov 2019 19:36:39 +0000 (19:36 +0000)]
subdirmk: Implement new syntax

But I plan to go back to ^ and ~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMerge commit 'c0b216c79763f720df20e002fc14c9348a0e05c2'
Ian Jackson [Thu, 14 Nov 2019 19:02:07 +0000 (19:02 +0000)]
Merge commit 'c0b216c79763f720df20e002fc14c9348a0e05c2'

4 years agodocs: Discuss variable settings and inclusion order
Ian Jackson [Thu, 14 Nov 2019 15:43:14 +0000 (15:43 +0000)]
docs: Discuss variable settings and inclusion order

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Actually clear right variable
Ian Jackson [Thu, 14 Nov 2019 15:42:19 +0000 (15:42 +0000)]
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>
4 years agodocs: Abolish all absolute pathname syntaxes
Ian Jackson [Thu, 14 Nov 2019 14:54:48 +0000 (14:54 +0000)]
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>
4 years agodocs: Improve docs.
Ian Jackson [Thu, 14 Nov 2019 14:26:12 +0000 (14:26 +0000)]
docs: Improve docs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Fill in an empty cell with a copy instead
Ian Jackson [Thu, 14 Nov 2019 14:25:51 +0000 (14:25 +0000)]
docs: Fill in an empty cell with a copy instead

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Transpose columns in path syntax reference
Ian Jackson [Thu, 14 Nov 2019 14:15:48 +0000 (14:15 +0000)]
docs: Transpose columns in path syntax reference

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Change . to require rather than imply @
Ian Jackson [Thu, 14 Nov 2019 14:13:44 +0000 (14:13 +0000)]
docs: Change . to require rather than imply @

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Further corresponding new syntax
Ian Jackson [Thu, 14 Nov 2019 14:03:18 +0000 (14:03 +0000)]
docs: Further corresponding new syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: wip new syntax
Ian Jackson [Thu, 14 Nov 2019 13:56:19 +0000 (13:56 +0000)]
docs: wip new syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Swap rows in syntax table
Ian Jackson [Thu, 14 Nov 2019 13:33:26 +0000 (13:33 +0000)]
docs: Swap rows in syntax table

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: New plan for directory references, further
Ian Jackson [Thu, 14 Nov 2019 13:33:19 +0000 (13:33 +0000)]
docs: New plan for directory references, further

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: New plan for directory references, new
Ian Jackson [Thu, 14 Nov 2019 13:30:44 +0000 (13:30 +0000)]
docs: New plan for directory references, new

Not yet implemented.  About to simplify this...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: New plan for directory references
Ian Jackson [Thu, 14 Nov 2019 12:59:30 +0000 (12:59 +0000)]
docs: New plan for directory references

Not yet implemented.  About to simplify this...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodocs: Summarise directory reference syntaxes, permute
Ian Jackson [Thu, 14 Nov 2019 12:39:00 +0000 (12:39 +0000)]
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>
4 years agodocs: Summarise directory reference syntaxes
Ian Jackson [Thu, 14 Nov 2019 12:36:23 +0000 (12:36 +0000)]
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>
4 years agolegal: Include DEVELOPER-CERTIFICATE
Ian Jackson [Thu, 14 Nov 2019 02:13:04 +0000 (02:13 +0000)]
legal: Include DEVELOPER-CERTIFICATE

A symlink to subdirmk's copy.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoClarify incremental paragraph
Ian Jackson [Thu, 14 Nov 2019 02:06:16 +0000 (02:06 +0000)]
Clarify incremental paragraph

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoClarify race lossage paragraph
Ian Jackson [Thu, 14 Nov 2019 02:05:11 +0000 (02:05 +0000)]
Clarify race lossage paragraph

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoSome hints in docs
Ian Jackson [Thu, 14 Nov 2019 02:03:45 +0000 (02:03 +0000)]
Some hints in docs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Honour CHECK_SILENT='' to print all the runes
Ian Jackson [Thu, 14 Nov 2019 01:52:20 +0000 (01:52 +0000)]
build system: Honour CHECK_SILENT='' to print all the runes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Fix out of tree builds again
Ian Jackson [Thu, 14 Nov 2019 01:49:36 +0000 (01:49 +0000)]
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>
4 years agoCREDITS: Credit Mark properly (!)
Ian Jackson [Thu, 14 Nov 2019 01:43:48 +0000 (01:43 +0000)]
CREDITS: Credit Mark properly (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMerge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk
Ian Jackson [Thu, 14 Nov 2019 01:42:11 +0000 (01:42 +0000)]
Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk

4 years agobuild system: ipaddrset.confirm
Ian Jackson [Thu, 14 Nov 2019 01:38:42 +0000 (01:38 +0000)]
build system: ipaddrset.confirm

Make it like the others.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Use subdirmk cdeps.sd.mk
Ian Jackson [Thu, 14 Nov 2019 01:35:37 +0000 (01:35 +0000)]
build system: Use subdirmk cdeps.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Provide `check' and `fullcheck' everywhere
Ian Jackson [Thu, 14 Nov 2019 01:24:55 +0000 (01:24 +0000)]
build system: Provide `check' and `fullcheck' everywhere

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Reorganise check targets
Ian Jackson [Thu, 14 Nov 2019 01:24:39 +0000 (01:24 +0000)]
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>
4 years agobuild system: Make check targets double-colon
Ian Jackson [Thu, 14 Nov 2019 01:24:11 +0000 (01:24 +0000)]
build system: Make check targets double-colon

For compatibility with subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: convert stest and mtest to Subdir.mk
Ian Jackson [Thu, 14 Nov 2019 01:17:01 +0000 (01:17 +0000)]
build system: convert stest and mtest to Subdir.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest-common: Cope if argv0 starts with ./
Ian Jackson [Thu, 14 Nov 2019 01:17:17 +0000 (01:17 +0000)]
test-common: Cope if argv0 starts with ./

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Convert test-example to subdirmk
Ian Jackson [Thu, 14 Nov 2019 00:40:37 +0000 (00:40 +0000)]
build system: Convert test-example to subdirmk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agobuild system: Use SUBDIRMK_MAKEFILES for common.make etc.
Ian Jackson [Thu, 14 Nov 2019 00:39:24 +0000 (00:39 +0000)]
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>
4 years agobuild system: Do not use autoconf's `rm'
Ian Jackson [Thu, 14 Nov 2019 00:36:38 +0000 (00:36 +0000)]
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>
4 years agobuild system: Fix automatic autoheader invocation.
Ian Jackson [Thu, 14 Nov 2019 00:20:46 +0000 (00:20 +0000)]
build system: Fix automatic autoheader invocation.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoSwitch to using subdirmk for the top-level
Ian Jackson [Thu, 14 Nov 2019 00:04:19 +0000 (00:04 +0000)]
Switch to using subdirmk for the top-level

We have incorporated the subdirectories yet...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES
Ian Jackson [Thu, 14 Nov 2019 00:00:11 +0000 (00:00 +0000)]
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>
4 years agosubdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES
Ian Jackson [Thu, 14 Nov 2019 00:00:11 +0000 (00:00 +0000)]
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>
4 years agosubdirmk: Rename MAKEFILES variable
Ian Jackson [Thu, 14 Nov 2019 00:20:07 +0000 (00:20 +0000)]
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>
4 years agosubdirmk: Rename MAKEFILES variable
Ian Jackson [Thu, 14 Nov 2019 00:20:07 +0000 (00:20 +0000)]
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>
4 years agosubdirmk: Honour CONFIG_STATUS_OUTPUTS
Ian Jackson [Thu, 14 Nov 2019 00:13:24 +0000 (00:13 +0000)]
subdirmk: Honour CONFIG_STATUS_OUTPUTS

Principally to support autoheader.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Honour CONFIG_STATUS_OUTPUTS
Ian Jackson [Thu, 14 Nov 2019 00:13:24 +0000 (00:13 +0000)]
subdirmk: Honour CONFIG_STATUS_OUTPUTS

Principally to support autoheader.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Make \& work (!)
Ian Jackson [Thu, 14 Nov 2019 00:00:02 +0000 (00:00 +0000)]
subdirmk: Make \& work (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agosubdirmk: Make \& work (!)
Ian Jackson [Thu, 14 Nov 2019 00:00:02 +0000 (00:00 +0000)]
subdirmk: Make \& work (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoAdd 'subdirmk/' from commit 'f1789a0ae66174a95c8d629738eae98d40c084ac'
Ian Jackson [Wed, 13 Nov 2019 23:24:27 +0000 (23:24 +0000)]
Add 'subdirmk/' from commit 'f1789a0ae66174a95c8d629738eae98d40c084ac'

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

4 years agoTwo minor docs fixes
Ian Jackson [Wed, 13 Nov 2019 23:03:55 +0000 (23:03 +0000)]
Two minor docs fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDrop AC_PROG_INSTALL and remove build-aux/install-sh from example
Ian Jackson [Wed, 13 Nov 2019 22:58:03 +0000 (22:58 +0000)]
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>
4 years agotest regeneration after a -included .in file changes
Ian Jackson [Wed, 13 Nov 2019 22:56:45 +0000 (22:56 +0000)]
test regeneration after a -included .in file changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest regeneration after a &:-included file (ie a .sd.mk) changes
Ian Jackson [Wed, 13 Nov 2019 22:47:24 +0000 (22:47 +0000)]
test regeneration after a &:-included file (ie a .sd.mk) changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoTests: use set -x
Ian Jackson [Wed, 13 Nov 2019 22:47:13 +0000 (22:47 +0000)]
Tests: use set -x

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoFix docs typo
Ian Jackson [Wed, 13 Nov 2019 22:38:36 +0000 (22:38 +0000)]
Fix docs typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotests/check: New test script, quite basic
Ian Jackson [Wed, 13 Nov 2019 22:38:23 +0000 (22:38 +0000)]
tests/check: New test script, quite basic

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoTranspose directories
Ian Jackson [Wed, 13 Nov 2019 22:31:43 +0000 (22:31 +0000)]
Transpose directories

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDocumentation for regen.mk
Ian Jackson [Wed, 13 Nov 2019 22:26:50 +0000 (22:26 +0000)]
Documentation for regen.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agorealclean: Use @_SUBDIRMK_MAKEFILES@
Ian Jackson [Wed, 13 Nov 2019 22:26:34 +0000 (22:26 +0000)]
realclean: Use @_SUBDIRMK_MAKEFILES@

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDrop Perdir.sd.mk from explicit MAKEFILE_TEMPLATES
Ian Jackson [Wed, 13 Nov 2019 22:25:46 +0000 (22:25 +0000)]
Drop Perdir.sd.mk from explicit MAKEFILE_TEMPLATES

generate does this itself now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDocumentation for usual.mk.in
Ian Jackson [Wed, 13 Nov 2019 22:14:48 +0000 (22:14 +0000)]
Documentation for usual.mk.in

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDocumentation for clean.sd.mk and cdeps.sd.mk
Ian Jackson [Wed, 13 Nov 2019 22:12:10 +0000 (22:12 +0000)]
Documentation for clean.sd.mk and cdeps.sd.mk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMove knowledge of DEPFILES into cdeps.sd.mk
Ian Jackson [Wed, 13 Nov 2019 22:11:47 +0000 (22:11 +0000)]
Move knowledge of DEPFILES into cdeps.sd.mk

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoIntroduce CDEPS_CFLAGS so without cdeps.sd.mk you don't get .*.d
Ian Jackson [Wed, 13 Nov 2019 22:04:32 +0000 (22:04 +0000)]
Introduce CDEPS_CFLAGS so without cdeps.sd.mk you don't get .*.d

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoNew &# feature
Ian Jackson [Wed, 13 Nov 2019 22:03:57 +0000 (22:03 +0000)]
New &# feature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMore docs updates
Ian Jackson [Wed, 13 Nov 2019 22:02:55 +0000 (22:02 +0000)]
More docs updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMerge branch 'master' of https://git.distorted.org.uk/~markw/subdirmk
Ian Jackson [Wed, 13 Nov 2019 21:42:10 +0000 (21:42 +0000)]
Merge branch 'master' of https://git.distorted.org.uk/~markw/subdirmk

4 years agosubdirmk/*: Some simple whitespace cleanups
Mark Wooding [Wed, 13 Nov 2019 19:17:40 +0000 (19:17 +0000)]
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>
4 years agosubdirmk/generate: Make `FORCE-ALWAYS-RUN' be `.PHONY'
Mark Wooding [Wed, 13 Nov 2019 19:24:41 +0000 (19:24 +0000)]
subdirmk/generate: Make `FORCE-ALWAYS-RUN' be `.PHONY'

Otherwise `touch FORCE-ALWAYS-RUN' stops your build from working, which
seems a shame, even though nobody should ever want to do this.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
4 years agosubdirmk/usual.mk.in: Fix `VPATH' setting
Mark Wooding [Wed, 13 Nov 2019 19:08:46 +0000 (19:08 +0000)]
subdirmk/usual.mk.in: Fix `VPATH' setting

This file isn't processed through `generate', so `&' doesn't mean
anything special.

Use `$(top_srcdir)' here because we can rely on that being established
by `main.mk'.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
4 years agosubdirmk/regen.mk.in: Trim `$(srcdir)/' prefix from output makefile names
Mark Wooding [Wed, 13 Nov 2019 19:00:23 +0000 (19:00 +0000)]
subdirmk/regen.mk.in: Trim `$(srcdir)/' prefix from output makefile names

This doesn't make a difference if you're doing in-tree builds, of course.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
4 years agosubdirmk/generate: Supply default target if none given in command line
Mark Wooding [Wed, 13 Nov 2019 18:42:18 +0000 (18:42 +0000)]
subdirmk/generate: Supply default target if none given in command line

If you just run `make' then `$(MAKECMDGOALS)' is empty, so we get the
default target of `main.mk'.  Nothing is set up by `usual.mk', so we
end up with `$(srcdir)/configure' established by `regen.mk'.

Instead, propagate `all' to the `main.mk' makefile.  Maybe this should
be configurable, though I don't think that'll be very useful in real
life.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
4 years agosubdirmk/autogen.sh: Remove myself as copyright holder
Mark Wooding [Wed, 13 Nov 2019 18:48:42 +0000 (18:48 +0000)]
subdirmk/autogen.sh: Remove myself as copyright holder

I had nothing to do with this.  My original proof-of-concept suggested
that developers use `autoreconf' to bootstrap the working tree.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
4 years agomore docs changes
Ian Jackson [Wed, 13 Nov 2019 18:08:18 +0000 (18:08 +0000)]
more docs changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomore docs fixes
Ian Jackson [Wed, 13 Nov 2019 18:05:11 +0000 (18:05 +0000)]
more docs fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agomore docs
Ian Jackson [Wed, 13 Nov 2019 18:00:18 +0000 (18:00 +0000)]
more docs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agominor docs change
Ian Jackson [Wed, 13 Nov 2019 17:56:08 +0000 (17:56 +0000)]
minor docs change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoabbreviate some copyright notices
Ian Jackson [Wed, 13 Nov 2019 17:55:46 +0000 (17:55 +0000)]
abbreviate some copyright notices

No change to legal effect.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoadd copyright and licence notices to other files
Ian Jackson [Wed, 13 Nov 2019 17:55:02 +0000 (17:55 +0000)]
add copyright and licence notices to other files

In many cases I copied bits from mdw's originals, so they are all
potentially mdw's.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoadd copyright and licence notices to example .[ch] files
Ian Jackson [Wed, 13 Nov 2019 17:53:55 +0000 (17:53 +0000)]
add copyright and licence notices to example .[ch] files

Checked with mdw on irc that this was his intent.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoadd legal information including clear copyright grant
Ian Jackson [Wed, 13 Nov 2019 17:51:58 +0000 (17:51 +0000)]
add legal information including clear copyright grant

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years ago.gitignore: adjust some comments
Ian Jackson [Wed, 13 Nov 2019 17:51:30 +0000 (17:51 +0000)]
.gitignore: adjust some comments

4 years agointroduce some boilerplate files
Ian Jackson [Wed, 13 Nov 2019 17:50:56 +0000 (17:50 +0000)]
introduce some boilerplate files