Reorganize build rules.

diff --git a/Makefile b/Makefile
index ab7e9e6fb51bd02503a8397302fc08704a664ef2..f8ecaf383122d154d052b923fa5fd89f86c4ad09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,10 @@
 #!/usr/bin/make -f
 
-node-webkit-version := 0.10.4
-
-.DELETE_ON_ERROR:
-include rules/programs.mk
-include rules/javascript.mk
-include rules/icons.mk
-include rules/git.mk
-include rules/node-webkit.mk
-include rules/pngcrush.mk
-
-.PHONY: all check distclean lint test dist clean serve
-
 APPLICATION := yuu
 DISTDIR := build/dist
 VERSION := $(call git-describe)
 DISTROOT := $(DISTDIR)/$(APPLICATION)_$(VERSION)
+node-webkit-version := 0.10.4
 
 FIND_FILES := -type f ! -name '.*'
 FIND_JS := -type f -name '*.js'
@@ -43,7 +32,7 @@ BUILT := $(ICONS) $(IMAGES)
 
 HTTP_SERVER_PORT ?= 8000
 
-all: check $(BUILT) $(call pngcrush-stampify,$(IMAGES))
+all: $(BUILT) $(call pngcrush-stampify,$(IMAGES))
 
 $(DISTDIR):
        mkdir -p $@
@@ -99,3 +88,13 @@ $(DISTROOT).bare.zip: | .git
        tools/generate-nw $@.tmp `echo $(*F) | sed -E 's/.+_[^0-9]+//'`
        cd $@.tmp && $(ZIP) -r ../$(@F) .
        $(RM) -r $@.tmp
+
+include rules/programs.mk
+include rules/javascript.mk
+include rules/icons.mk
+include rules/git.mk
+include rules/node-webkit.mk
+include rules/pngcrush.mk
+
+.DELETE_ON_ERROR:
+.PHONY: all check distclean lint test dist clean serve

diff --git a/rules/node-webkit.mk b/rules/node-webkit.mk
index dd46e17924e281da19ef032f6fc85e85f62a4693..08c2b4375595e9413aaf5e63d5c17e8c05adbb21 100644 (file)
--- a/rules/node-webkit.mk
+++ b/rules/node-webkit.mk
@@ -93,7 +93,9 @@ endef
        $(call node-webkit-package-win,$<,$(word 2,$^))
 
 $(node-webkit-directx):
-       wget -O $@ 'https://github.com/cefsharp/cef-binary/raw/1e51255cf77d267899bf7834768b8774affaad2d/cef_binary_3.y.z_windows32/Release/'$(notdir $@)
+       mkdir -p $(@D)
+       wget -O $@ 'https://github.com/cefsharp/cef-binary/raw/1e51255cf77d267899bf7834768b8774affaad2d/cef_binary_3.y.z_windows32/Release/'$(@F)
 
 $(node-webkit-prefix)dxwebsetup.exe:
+       mkdir -p $(@D)
        wget -O $@ http://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe