Skip to content

Commit ea45e77

Browse files
author
Christopher J. Brody
committed
simplify wrapping of dist/sql-*.js in Makefile
1 parent d86b100 commit ea45e77

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

Makefile

+10-15
Original file line numberDiff line numberDiff line change
@@ -76,36 +76,31 @@ debug: dist/sql-asm-debug.js dist/sql-wasm-debug.js
7676

7777
dist/sql-asm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
7878
$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) $(EMFLAGS_ASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
79-
mv $@ out/tmp-raw.js
80-
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
81-
rm out/tmp-raw.js
79+
cat src/shell-pre.js $@ src/shell-post.js > out/sql-wrapped.js
80+
mv out/sql-wrapped.js $@
8281

8382
dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
8483
$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) $(EMFLAGS_WASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
85-
mv $@ out/tmp-raw.js
86-
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
87-
rm out/tmp-raw.js
84+
cat src/shell-pre.js $@ src/shell-post.js > out/sql-wrapped.js
85+
mv out/sql-wrapped.js $@
8886

8987
.PHONY: optimized
9088
optimized: dist/sql-asm.js dist/sql-wasm.js dist/sql-asm-memory-growth.js
9189

9290
dist/sql-asm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
9391
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_ASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
94-
mv $@ out/tmp-raw.js
95-
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
96-
rm out/tmp-raw.js
92+
cat src/shell-pre.js $@ src/shell-post.js > out/sql-wrapped.js
93+
mv out/sql-wrapped.js $@
9794

9895
dist/sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
9996
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_WASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
100-
mv $@ out/tmp-raw.js
101-
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
102-
rm out/tmp-raw.js
97+
cat src/shell-pre.js $@ src/shell-post.js > out/sql-wrapped.js
98+
mv out/sql-wrapped.js $@
10399

104100
dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
105101
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_ASM_MEMORY_GROWTH) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
106-
mv $@ out/tmp-raw.js
107-
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
108-
rm out/tmp-raw.js
102+
cat src/shell-pre.js $@ src/shell-post.js > out/sql-wrapped.js
103+
mv out/sql-wrapped.js $@
109104

110105

111106
# Web worker API

0 commit comments

Comments
 (0)