chiark / gitweb /
subdirmk.git
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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

8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months 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>
8 months ago.gitignore: adjust some comments
Ian Jackson [Wed, 13 Nov 2019 17:51:30 +0000 (17:51 +0000)]
.gitignore: adjust some comments

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

8 months agofix stub Makefile to use MAKECMDGOALS
Ian Jackson [Wed, 13 Nov 2019 17:20:22 +0000 (17:20 +0000)]
fix stub Makefile to use MAKECMDGOALS

otherwise if you give multiple goals it would reenter main.mk

8 months agoactually reject missing .sd.mk files when appropriate
Ian Jackson [Wed, 13 Nov 2019 17:20:12 +0000 (17:20 +0000)]
actually reject missing .sd.mk files when appropriate

8 months agodeps .*.d
Ian Jackson [Wed, 13 Nov 2019 17:17:28 +0000 (17:17 +0000)]
deps .*.d

8 months agodocs
Ian Jackson [Wed, 13 Nov 2019 16:52:49 +0000 (16:52 +0000)]
docs

8 months agoadd missing ignore
Ian Jackson [Wed, 13 Nov 2019 16:52:43 +0000 (16:52 +0000)]
add missing ignore

8 months agobetter generation of MAKEFILE_TEMPLATES (dedupe)
Ian Jackson [Wed, 13 Nov 2019 16:52:29 +0000 (16:52 +0000)]
better generation of MAKEFILE_TEMPLATES (dedupe)

8 months agodo not demand \W after CAPS and lc
Ian Jackson [Wed, 13 Nov 2019 16:52:12 +0000 (16:52 +0000)]
do not demand \W after CAPS and lc

8 months agomake TARGETS make :: rules
Ian Jackson [Wed, 13 Nov 2019 16:51:53 +0000 (16:51 +0000)]
make TARGETS make :: rules

8 months agochange filenames
Ian Jackson [Wed, 13 Nov 2019 16:12:20 +0000 (16:12 +0000)]
change filenames

8 months agowip docs
Ian Jackson [Wed, 13 Nov 2019 15:27:02 +0000 (15:27 +0000)]
wip docs

8 months agoalways run regenerate from config.status
Ian Jackson [Wed, 13 Nov 2019 15:26:43 +0000 (15:26 +0000)]
always run regenerate from config.status

it is too hard to figure out when to do this, and it is fast

8 months agowip docs, before rename .mk.in
Ian Jackson [Wed, 13 Nov 2019 15:20:56 +0000 (15:20 +0000)]
wip docs, before rename .mk.in

8 months agomake Perdir.mk.in optional
Ian Jackson [Wed, 13 Nov 2019 15:16:43 +0000 (15:16 +0000)]
make Perdir.mk.in optional

8 months agofurther refactor filter_subdir_mk, replace loop with calls, nfc
Ian Jackson [Wed, 13 Nov 2019 15:16:23 +0000 (15:16 +0000)]
further refactor filter_subdir_mk, replace loop with calls, nfc

8 months agofurther refactor filter_subdir_mk, moving $srcdir, nfc
Ian Jackson [Wed, 13 Nov 2019 15:15:41 +0000 (15:15 +0000)]
further refactor filter_subdir_mk, moving $srcdir, nfc

8 months agorefactor filter_subdir_mk, breaking out $pi, nfc
Ian Jackson [Wed, 13 Nov 2019 15:14:55 +0000 (15:14 +0000)]
refactor filter_subdir_mk, breaking out $pi, nfc

8 months agowip docs
Ian Jackson [Wed, 13 Nov 2019 15:05:27 +0000 (15:05 +0000)]
wip docs

8 months agosort regen
Ian Jackson [Wed, 13 Nov 2019 15:05:22 +0000 (15:05 +0000)]
sort regen

8 months agovarious stuff into submakefiles
Ian Jackson [Wed, 13 Nov 2019 15:05:14 +0000 (15:05 +0000)]
various stuff into submakefiles

8 months agowip docs
Ian Jackson [Wed, 13 Nov 2019 14:48:15 +0000 (14:48 +0000)]
wip docs

8 months agomove much into usual.mk.in
Ian Jackson [Wed, 13 Nov 2019 13:48:52 +0000 (13:48 +0000)]
move much into usual.mk.in

8 months agocheck right thing in config_targets
Ian Jackson [Wed, 13 Nov 2019 13:48:34 +0000 (13:48 +0000)]
check right thing in config_targets

8 months ago&:include feature
Ian Jackson [Wed, 13 Nov 2019 13:48:21 +0000 (13:48 +0000)]
&:include feature

8 months ago$enoent_ok and GEN filehandle (nfc)
Ian Jackson [Wed, 13 Nov 2019 13:47:48 +0000 (13:47 +0000)]
$enoent_ok and GEN filehandle (nfc)

8 months agobuffering_output feature (nfc)
Ian Jackson [Wed, 13 Nov 2019 13:47:16 +0000 (13:47 +0000)]
buffering_output feature (nfc)

8 months agobreak out process_input_mk (nfc)
Ian Jackson [Wed, 13 Nov 2019 13:26:00 +0000 (13:26 +0000)]
break out process_input_mk (nfc)

8 months agorun config.status with selective tags, better, docs
Ian Jackson [Wed, 13 Nov 2019 13:13:19 +0000 (13:13 +0000)]
run config.status with selective tags, better, docs

8 months agorun config.status with selective tags
Ian Jackson [Wed, 13 Nov 2019 13:04:43 +0000 (13:04 +0000)]
run config.status with selective tags

8 months agoWIP attempt to run config.status with selective tags
Ian Jackson [Wed, 13 Nov 2019 12:54:19 +0000 (12:54 +0000)]
WIP attempt to run config.status with selective tags

Does not work right now...

8 months agoclarify comment
Ian Jackson [Wed, 13 Nov 2019 01:30:35 +0000 (01:30 +0000)]
clarify comment

8 months agofix out of tree builds
Ian Jackson [Wed, 13 Nov 2019 01:24:52 +0000 (01:24 +0000)]
fix out of tree builds

8 months agofixes
Ian Jackson [Wed, 13 Nov 2019 01:09:37 +0000 (01:09 +0000)]
fixes

8 months agodocs
Ian Jackson [Wed, 13 Nov 2019 00:54:51 +0000 (00:54 +0000)]
docs

8 months agodocs
Ian Jackson [Wed, 13 Nov 2019 00:53:01 +0000 (00:53 +0000)]
docs

8 months ago&! new esc can be anything
Ian Jackson [Wed, 13 Nov 2019 00:52:41 +0000 (00:52 +0000)]
&! new esc can be anything

8 months agotidying
Ian Jackson [Wed, 13 Nov 2019 00:44:11 +0000 (00:44 +0000)]
tidying

8 months agotidying
Ian Jackson [Wed, 13 Nov 2019 00:43:46 +0000 (00:43 +0000)]
tidying

8 months agotidying
Ian Jackson [Wed, 13 Nov 2019 00:42:38 +0000 (00:42 +0000)]
tidying

8 months agotidying
Ian Jackson [Wed, 13 Nov 2019 00:41:30 +0000 (00:41 +0000)]
tidying

8 months agotidying
Ian Jackson [Wed, 13 Nov 2019 00:34:02 +0000 (00:34 +0000)]
tidying

8 months agodep on subdirmk.ac
Ian Jackson [Wed, 13 Nov 2019 00:29:04 +0000 (00:29 +0000)]
dep on subdirmk.ac

8 months agoCONFIGURE_ACS
Ian Jackson [Wed, 13 Nov 2019 00:28:08 +0000 (00:28 +0000)]
CONFIGURE_ACS

8 months agoPerdir dep
Ian Jackson [Wed, 13 Nov 2019 00:23:39 +0000 (00:23 +0000)]
Perdir dep

8 months agocleaning
Ian Jackson [Wed, 13 Nov 2019 00:23:32 +0000 (00:23 +0000)]
cleaning

8 months agoWIP
Ian Jackson [Tue, 12 Nov 2019 17:56:46 +0000 (17:56 +0000)]
WIP

8 months agoWIP
Ian Jackson [Tue, 12 Nov 2019 17:51:40 +0000 (17:51 +0000)]
WIP

8 months agoWIP REORG
Ian Jackson [Tue, 12 Nov 2019 17:34:03 +0000 (17:34 +0000)]
WIP REORG

8 months agoWORKS
Ian Jackson [Tue, 12 Nov 2019 17:13:06 +0000 (17:13 +0000)]
WORKS

8 months agoDOES NOT WORK
Ian Jackson [Tue, 12 Nov 2019 17:11:26 +0000 (17:11 +0000)]
DOES NOT WORK

8 months agoTEST MULTI OUTPUT THING
Ian Jackson [Tue, 12 Nov 2019 17:10:03 +0000 (17:10 +0000)]
TEST MULTI OUTPUT THING

8 months agoWIP
Ian Jackson [Mon, 11 Nov 2019 02:15:08 +0000 (02:15 +0000)]
WIP

8 months agowip
Ian Jackson [Mon, 11 Nov 2019 02:12:54 +0000 (02:12 +0000)]
wip

8 months agoWIP
Ian Jackson [Mon, 11 Nov 2019 01:46:10 +0000 (01:46 +0000)]
WIP

8 months agowip
Ian Jackson [Mon, 11 Nov 2019 00:57:54 +0000 (00:57 +0000)]
wip

8 months agoWIP
Ian Jackson [Mon, 11 Nov 2019 00:55:16 +0000 (00:55 +0000)]
WIP

8 months agowip
Ian Jackson [Mon, 11 Nov 2019 00:16:44 +0000 (00:16 +0000)]
wip

8 months agoWIP
Ian Jackson [Mon, 11 Nov 2019 00:03:27 +0000 (00:03 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 21:05:54 +0000 (21:05 +0000)]
WIP

8 months agoCOMING ALONG
Ian Jackson [Sun, 10 Nov 2019 21:00:25 +0000 (21:00 +0000)]
COMING ALONG

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:55:50 +0000 (20:55 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:54:28 +0000 (20:54 +0000)]
WIP

8 months agoRUNS BUT NOT VERY GOOD
Ian Jackson [Sun, 10 Nov 2019 20:49:18 +0000 (20:49 +0000)]
RUNS BUT NOT VERY GOOD

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:40:23 +0000 (20:40 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:39:57 +0000 (20:39 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:31:11 +0000 (20:31 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:28:32 +0000 (20:28 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:28:18 +0000 (20:28 +0000)]
WIP

8 months agoWIP
Ian Jackson [Sun, 10 Nov 2019 20:24:06 +0000 (20:24 +0000)]
WIP

8 months agoBEFORE CHANGE &&
Ian Jackson [Sun, 10 Nov 2019 19:24:39 +0000 (19:24 +0000)]
BEFORE CHANGE &&