move obj to build/obj

This commit is contained in:
dzaima 2022-11-17 20:44:10 +02:00
parent 83a6565820
commit 274d02b98b
2 changed files with 33 additions and 19 deletions

31
.gitignore vendored
View File

@ -1,24 +1,37 @@
# outputs
/BQN /BQN
/BQN.html /BQN.html
/BQN.js /BQN.js
*.wasm *.wasm
*.cwasm *.cwasm
perf.* libcbqn.so
/obj/
/asm_* # build system things
/build/obj/
/build/singeliLocal
/build/replxxLocal
/src/singeli/gen /src/singeli/gen
/Singeli
build/singeliLocal # files generated by CBQN or other utilities
build/replxxLocal perf.*
/local/ /asm_*
CBQNHeapDump CBQNHeapDump
# test temporary files
/test/ffi/ffiTest.o /test/ffi/ffiTest.o
/test/ffi/test.got /test/ffi/test.got
/test/ffi/shared.got /test/ffi/shared.got
/test/ffi/sharedTest /test/ffi/sharedTest
/test/ffi/lib.so /test/ffi/lib.so
libcbqn.so
# local files
/local/
# clangd # clangd
compile_commands.json compile_commands.json
/.cache/ /.cache/
# things not used anymore, but still may be present in existing clones:
/Singeli/
/SingeliClone/
/obj/

View File

@ -144,7 +144,7 @@ endif
builddir: builddir:
ifeq ($(force_build_dir),) ifeq ($(force_build_dir),)
@printf 'obj/' @printf 'build/obj/'
ifeq ($(custom),) ifeq ($(custom),)
@echo "def_$(i_t)" @echo "def_$(i_t)"
else else
@ -179,7 +179,7 @@ else
ifeq ($(i_singeli), 1) ifeq ($(i_singeli), 1)
@mkdir -p src/singeli/gen @mkdir -p src/singeli/gen
@mkdir -p obj/singeli @mkdir -p build/obj/singeli
@${MAKE} postmsg="post-singeli build:" build_singeli @${MAKE} postmsg="post-singeli build:" build_singeli
endif endif
@ -248,14 +248,14 @@ ifeq ($(SINGELI_DIR),build/singeliSubmodule)
@git submodule update --init build/singeliSubmodule @git submodule update --init build/singeliSubmodule
endif endif
@echo "pre-singeli build:" @echo "pre-singeli build:"
@${MAKE} i_singeli=0 singeli=0 force_build_dir=obj/presingeli REPLXX=0 f= lf= postmsg="singeli sources:" i_t=presingeli i_f='-O1 -DPRE_SINGELI' FFI=0 OUTPUT=obj/presingeli/BQN c @${MAKE} i_singeli=0 singeli=0 force_build_dir=build/obj/presingeli REPLXX=0 f= lf= postmsg="singeli sources:" i_t=presingeli i_f='-O1 -DPRE_SINGELI' FFI=0 OUTPUT=build/obj/presingeli/BQN c
build_singeli: ${addprefix src/singeli/gen/, cmp.c dyarith.c copy.c equal.c squeeze.c scan.c neq.c slash.c constrep.c bits.c} build_singeli: ${addprefix src/singeli/gen/, cmp.c dyarith.c copy.c equal.c squeeze.c scan.c neq.c slash.c constrep.c bits.c}
@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 "$(SINGELI_DIR)" $< $@ "obj/singeli/" @build/obj/presingeli/BQN SingeliMake.bqn "$(SINGELI_DIR)" $< $@ "build/obj/singeli/"
ifeq (${i_singeli}, 1) ifeq (${i_singeli}, 1)
# arithmetic table generator # arithmetic table generator
@ -269,7 +269,7 @@ src/singeli/gen/arTables.c: genArithTables
.INTERMEDIATE: genArithTables .INTERMEDIATE: genArithTables
genArithTables: src/singeli/src/genArithTables.bqn preSingeliBin genArithTables: src/singeli/src/genArithTables.bqn preSingeliBin
@echo " generating arDefs.singeli & arTables.c" @echo " generating arDefs.singeli & arTables.c"
@obj/presingeli/BQN src/singeli/src/genArithTables.bqn "$$PWD/src/singeli/gen/arDefs.singeli" "$$PWD/src/singeli/gen/arTables.c" @build/obj/presingeli/BQN src/singeli/src/genArithTables.bqn "$$PWD/src/singeli/gen/arDefs.singeli" "$$PWD/src/singeli/gen/arTables.c"
endif endif
@ -298,7 +298,7 @@ endif # replxx
# dependency files # dependency files
-include $(bd)/*.d -include $(bd)/*.d
ifeq (${i_singeli}, 1) ifeq (${i_singeli}, 1)
-include obj/singeli/*.d -include build/obj/singeli/*.d
endif endif
DESTDIR = DESTDIR =
@ -311,13 +311,14 @@ uninstall:
clean-singeli: clean-singeli:
rm -rf src/singeli/gen/ rm -rf src/singeli/gen/
rm -rf obj/singeli/ rm -rf build/obj/singeli/
@${MAKE} clean-specific bd=obj/presingeli @${MAKE} clean-specific bd=build/obj/presingeli
clean-runtime: clean-runtime:
rm -f src/gen/customRuntime rm -f src/gen/customRuntime
clean-build: clean-build:
rm -f obj/*/*.o rm -f build/obj/*/*.o
rm -f obj/*/*.d rm -f build/obj/*/*.d
rm -f build/obj/*/BQN
clean-specific: clean-specific:
rm -f $(bd)/*.o rm -f $(bd)/*.o
rm -f $(bd)/*.d rm -f $(bd)/*.d