attempt at fixing some makefile problems

This commit is contained in:
dzaima 2022-09-01 17:55:36 +03:00
parent e72c7dc937
commit d32e373168
2 changed files with 13 additions and 7 deletions

View File

@ -2,11 +2,13 @@
# resolve arguments & files # resolve arguments & files
siDirRsrcfileRresfileRbuildDir •args siDirRsrcfileRresfileRbuildDir •args
filename ('/') srcfileR
siDir •file.At siDirR siDir •file.At siDirR
tmpfile •file.At "obj/singeliDeps"
srcfile •file.At srcfileR srcfile •file.At srcfileR
resfile •file.At resfileR resfile •file.At resfileR
depfile (•file.At buildDir) •file.At ".d"˜ ('/') srcfile tmpfile (•file.At buildDir) •file.At filename".d.orig"
depfile (•file.At buildDir) •file.At filename".d"
# invoke singeli, which creates the result file # invoke singeli, which creates the result file
("-d" tmpfile "-o" resfile srcfile) •Import siDir •file.At "singeli" ("-d" tmpfile "-o" resfile srcfile) •Import siDir •file.At "singeli"

View File

@ -158,6 +158,7 @@ else ifeq ($(origin builddir),command line)
else else
ifeq ($(i_singeli), 1) ifeq ($(i_singeli), 1)
@mkdir -p src/singeli/gen @mkdir -p src/singeli/gen
@mkdir -p obj/singeli
@${MAKE} postmsg="post-singeli build:" build_singeli @${MAKE} postmsg="post-singeli build:" build_singeli
endif endif
@ -220,13 +221,13 @@ build_singeli: ${addprefix src/singeli/gen/, cmp.c dyarith.c copy.c equal.c sque
@echo $(postmsg) @echo $(postmsg)
src/singeli/gen/%.c: src/singeli/src/%.singeli preSingeliBin src/singeli/gen/%.c: src/singeli/src/%.singeli preSingeliBin
@echo $< | cut -c 17- | sed 's/^/ /' @echo $< | cut -c 17- | sed 's/^/ /'
@obj/presingeli/BQN SingeliMake.bqn "$$(if [ -d Singeli ]; then echo Singeli; else echo SingeliClone; fi)" $< $@ "obj/presingeli/" @obj/presingeli/BQN SingeliMake.bqn "$$(if [ -d Singeli ]; then echo Singeli; else echo SingeliClone; fi)" $< $@ "obj/singeli/"
ifeq (${i_singeli}, 1) ifeq (${i_singeli}, 1)
# arithmetic singeli generator # arithmetic table generator
src/builtins/arithd2.c: src/singeli/c/dyarith.c src/builtins/arithd2.c: src/singeli/c/dyarith.c
src/singeli/c/dyarith.c: src/singeli/gen/arTables.c src/singeli/src/builtins/arithd.c: src/singeli/gen/arTables.c
src/singeli/src/dyarith.singeli: src/singeli/gen/arDefs.singeli src/singeli/gen/dyarith.c: src/singeli/gen/arDefs.singeli genArithTables
src/singeli/gen/arDefs.singeli: genArithTables src/singeli/gen/arDefs.singeli: genArithTables
src/singeli/gen/arTables.c: genArithTables src/singeli/gen/arTables.c: genArithTables
@ -242,7 +243,7 @@ endif
# dependency files # dependency files
-include $(bd)/*.d -include $(bd)/*.d
ifeq (${i_singeli}, 1) ifeq (${i_singeli}, 1)
-include obj/presingeli/*.d -include obj/singeli/*.d
endif endif
install: install:
@ -253,6 +254,7 @@ uninstall:
clean-singeli: clean-singeli:
rm -rf src/singeli/gen/ rm -rf src/singeli/gen/
rm -rf obj/singeli/
@${MAKE} clean-specific bd=obj/presingeli @${MAKE} clean-specific bd=obj/presingeli
clean-runtime: clean-runtime:
rm -f src/gen/customRuntime rm -f src/gen/customRuntime
@ -262,6 +264,8 @@ clean-build:
clean-specific: clean-specific:
rm -f $(bd)/*.o rm -f $(bd)/*.o
rm -f $(bd)/*.d rm -f $(bd)/*.d
rm -f $(bd)/BQN
rmdir $(bd); true
clean: clean-build clean-runtime clean-singeli clean: clean-build clean-runtime clean-singeli