equal
deleted
inserted
replaced
106 RST_FILES := $(filter-out $(RST_COMMON_FILES),$(sort $(wildcard *.rst) $(RST_GEN_FILES))) |
106 RST_FILES := $(filter-out $(RST_COMMON_FILES),$(sort $(wildcard *.rst) $(RST_GEN_FILES))) |
107 RST_HTML_FILES := $(RST_FILES:.rst=.html) |
107 RST_HTML_FILES := $(RST_FILES:.rst=.html) |
108 |
108 |
109 JS_FILES := $(wildcard *.js) |
109 JS_FILES := $(wildcard *.js) |
110 HTML_FILES := 2048.html |
110 HTML_FILES := 2048.html |
111 WWW_FILES := $(JS_FILES) $(HTML_FILES) $(RST_HTML_FILES) |
111 CSS_FILES := rst.css |
|
112 WWW_FILES := $(JS_FILES) $(HTML_FILES) $(CSS_FILES) $(RST_HTML_FILES) |
112 |
113 |
113 DIST_FILES = $(WWW_FILES) $(RST_FILES) VERSION |
114 DIST_FILES = $(WWW_FILES) $(RST_FILES) VERSION |
114 |
115 |
115 DIST_TARBALLS = $(DIST_DIR).tar.gz $(DIST_DIR).zip |
116 DIST_TARBALLS = $(DIST_DIR).tar.gz $(DIST_DIR).zip |
116 |
117 |
121 |
122 |
122 ifeq '' '$(SF_USER)' |
123 ifeq '' '$(SF_USER)' |
123 SF_USER := gavenkoa |
124 SF_USER := gavenkoa |
124 endif |
125 endif |
125 ifeq '' '$(DEFUN_USER)' |
126 ifeq '' '$(DEFUN_USER)' |
126 SF_USER := user |
127 DEFUN_USER := user |
127 endif |
128 endif |
128 |
129 |
129 .PHONY: deploy |
130 .PHONY: deploy |
130 deploy: deploy2defun deploy2sf |
131 deploy: deploy2defun deploy2sf |
131 |
132 |