Correct output names

LivInTheLookingGlass · Aug 21, 2024 · 8d3a4cb · 8d3a4cb
1 parent 91bb275
commit 8d3a4cb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/c/Makefile b/c/Makefile
@@ -68,9 +68,9 @@ native_test: native
 clean:
 	@rm -rf build dist {.,*,*/*}/{*.pyc,__pycache__,.mypy_cache,.pytest_cache,.benchmarks} || echo
 
-dist/lib.wasm: build/lib.c
+dist/lib.wasm: build/c-lib.c
 	@mkdir -p dist
-	@emcc build/lib.c -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/lib.js
+	@emcc build/lib.c -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/c-lib.js
 
 build/lib.c: ../LICENSE
 	@mkdir -p build

diff --git a/cplusplus/Makefile b/cplusplus/Makefile
@@ -60,9 +60,9 @@ native_test: native
 clean:
 	@rm -rf build dist {.,*,*/*}/{*.pyc,__pycache__,.mypy_cache,.pytest_cache,.benchmarks} || echo
 
-dist/lib.wasm: build/lib.cpp
+dist/cp-lib.wasm: build/lib.cpp
 	@mkdir -p dist
-	@emcc build/lib.cpp -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/lib.js
+	@emcc build/lib.cpp -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/cp-lib.js
 
 build/lib.cpp: ../LICENSE
 	@mkdir -p build

diff --git a/docs/Makefile b/docs/Makefile
@@ -40,17 +40,13 @@ _static/dist/bundle.js:
 	@mkdir -p _static/dist
 	@cp ../javascript/dist/bundle-js.js _static/dist/bundle-js.js
 
-_static/dist/c/lib.js:
-	@mkdir -p _static/dist/c
-	@$(MAKE) -C ../c dist/lib.wasm $(MFLAGS)
-	@cp ../c/dist/lib.js _static/dist/c-lib.js
-	@cp ../c/dist/lib.wasm _static/dist/c-lib.wasm
+_static/dist/c-lib.js:
+	@$(MAKE) -C ../c dist/c-lib.wasm $(MFLAGS)
+	@cp ../c/dist/c-lib.* _static/dist/
 
-_static/dist/cp/lib.js:
-	@mkdir -p _static/dist/cp
-	@$(MAKE) -C ../cplusplus dist/lib.wasm $(MFLAGS)
-	@cp ../c/dist/lib.js _static/dist/cp/lib.js
-	@cp ../c/dist/lib.wasm _static/dist/cp/lib.wasm
+_static/dist/cp-lib.js:
+	@$(MAKE) -C ../cplusplus dist/cp-lib.wasm $(MFLAGS)
+	@cp ../c/dist/cp-lib.* _static/dist/
 
 _static/dist/rust.js:
 	@cd ../rust && wasm-pack build --target web --out-dir ../docs/_static/dist/
@@ -60,7 +56,7 @@ _static/dist/python.tar.gz:
 
 .PHONY: html
 html:
-	@$(MAKE) _static/dist/bundle.js _static/dist/c/lib.js _static/dist/cp/lib.js _static/dist/python.tar.gz _static/dist/rust.js $(MFLAGS)
+	@$(MAKE) _static/dist/bundle.js _static/dist/c-lib.js _static/dist/cp-lib.js _static/dist/python.tar.gz _static/dist/rust.js $(MFLAGS)
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 # Catch-all target: route all unknown targets to Sphinx using the new