AwesomeAdam54321/inweb-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed -makefile error to do with chaptered module dependencies

Browse source
This commit is contained in:
Graham Nelson 2019-02-06 19:29:34 +00:00
parent 69a051c000
commit 1c86024ad3
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Chapter 6/Makefiles.w
View file

@ -167,7 +167,7 @@ void Makefiles::scan_makefile_line(text_stream *line, text_file_position *tfp, v
MW->module_name, MW->module_name, MW->module_name);
module *X;
LOOP_OVER_LINKED_LIST(X, module, MW->dependencies) {
WRITE(" $(%SWEB)/Contents.w $(%SWEB)/Chapter*/*.w $(%SWEB)/Sections/*.w",
WRITE(" $(%SWEB)/Contents.w $(%SWEB)/Chapter*/*.w",
X->module_name, X->module_name, X->module_name);
}
WRITE("\n");

2
Tangled/inweb.c
View file

@ -19728,7 +19728,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v
MW->module_name, MW->module_name, MW->module_name);
module *X;
LOOP_OVER_LINKED_LIST(X, module, MW->dependencies) {
WRITE(" $(%SWEB)/Contents.w $(%SWEB)/Chapter*/*.w $(%SWEB)/Sections/*.w",
WRITE(" $(%SWEB)/Contents.w $(%SWEB)/Chapter*/*.w",
X->module_name, X->module_name, X->module_name);
}
WRITE("\n");

1
foundation-test/Contents.w
View file

@ -10,3 +10,4 @@ Sections
Program Control
Unit Tests

6
foundation-test/foundation-test.mk
View file

@ -4,10 +4,10 @@
INTEST = intest/Tangled/intest
INWEB = inweb/Tangled/inweb
CC = clang -std=c99 -c $(MANYWARNINGS) $(CCOPTS) -g
CC = clang -std=c99 -c $(MANYWARNINGS) $(CCOPTS) -g
INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CCOPTS = -mmacosx-version-min=10.4 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
CCOPTS = -DPLATFORM_MACOSX=1 -mmacosx-version-min=10.4 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -ferror-limit=1000
@ -27,7 +27,7 @@ ME = inweb/foundation-test
# which depends on:
MODULE1 = inweb/foundation-module
$(ME)/Tangled/$(MYNAME): $(ME)/Contents.w $(ME)/Chapter*/*.w $(MODULE1)/Contents.w $(MODULE1)/Chapter*/*.w
$(ME)/Tangled/$(MYNAME): $(ME)/Contents.w $(ME)/Sections/*.w $(MODULE1)/Contents.w $(MODULE1)/Chapter*/*.w
$(call make-me)
.PHONY: force

2
foundation-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q13 4 February 2019
Abacus 1 *6Q14 6 February 2019