Skip to content
Snippets Groups Projects
Commit 46361010 authored by ezsh's avatar ezsh
Browse files

Unify module target definitions in the makefile

parent 52254d92
No related branches found
No related tags found
1 merge request!10480Put SugarCube format version in StoryData
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 6 deletions
Makefile
+ 4
− 6
View file @ 46361010
...@@ -33,11 +33,9 @@ bin/%.html: bin/tmp ...@@ -33,11 +33,9 @@ bin/%.html: bin/tmp
rm src/002-config/fc-version.js.commitHash.js rm src/002-config/fc-version.js.commitHash.js
mv $< $@ mv $< $@
bin/fc.js: bin/ # concatenated module files
devTools/concatFiles.sh js/ '*.js' $@ bin/fc.%: bin/
devTools/concatFiles.sh $*/ '*.$*' $@
bin/fc.css: bin/
devTools/concatFiles.sh css/ '*.css' $@
bin/tmp: bin/fc.js bin/fc.css injectGitCommitHash bin/tmp: bin/fc.js bin/fc.css injectGitCommitHash
$(TWEEGO) --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html src/ > $@ $(TWEEGO) --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html src/ > $@
...@@ -57,4 +55,4 @@ sugarcube: ...@@ -57,4 +55,4 @@ sugarcube:
(cd submodules/sugarcube-2/ && node build.js -6 -b 2) (cd submodules/sugarcube-2/ && node build.js -6 -b 2)
cp submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js cp submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
.PHONY: all sanity git sugarcube .PHONY: all sanity git injectGitCommitHash sugarcube
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment