simplify Makefile

Makefile

@@ -1,32 +1,29 @@
-all: js css scss
+all: wq.js compat
 
 init:
 	npm i
 	npm run bootstrap
 	mkdir -p static/app/js
 	mkdir -p static/app/css
+
+wq.js: init
+	npm run rollup -- -c
+	cp -p packages/app/css/wq.css static/app/css/wq.css
+	cp -p packages/mapbox/node_modules/mapbox-gl/dist/mapbox-gl.css static/app/css/mapbox-gl.css
+	cp -p packages/mapbox/node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css static/app/css/mapbox-gl-draw.css
+
+compat: init
 	mkdir -p js/wq
 	mkdir -p css/wq
 	mkdir -p scss/wq
-
-js: js_build js_lib
-	cp -p packages/jquery-mobile/compat/*.js js/wq/
-
-js_build: init
 	npm run rollup-all
-	npm run rollup -- -c
-
-js_leaflet_draw: init
+	cp -p packages/jquery-mobile/compat/*.js js/wq/
 	echo "define(['leaflet'], function(L) {" > js/leaflet.draw.js
 	cat packages/leaflet/node_modules/leaflet-draw/dist/leaflet.draw-src.js >> js/leaflet.draw.js
 	echo "\n});" >> js/leaflet.draw.js
-
-js_regenerator_runtime: init
 	echo "define(function() {" > js/regenerator-runtime.js
 	cat node_modules/regenerator-runtime/runtime.js >> js/regenerator-runtime.js
 	echo "\nreturn regeneratorRuntime;\n});" >> js/regenerator-runtime.js
-
-js_lib: init js_leaflet_draw js_regenerator_runtime
 	cp -p packages/react/node_modules/react/umd/react.production.min.js js/react.js
 	cp -p packages/react/node_modules/react-dom/umd/react-dom.production.min.js js/react-dom.js
 	cp -p packages/react/node_modules/react-is/umd/react-is.production.min.js js/react-is.js
@@ -48,21 +45,14 @@ js_lib: init js_leaflet_draw js_regenerator_runtime
 	cp -p packages/store/node_modules/localforage/dist/localforage.js js/localforage.js
 	cp -p packages/jquery-mobile/node_modules/mustache/mustache.js js/mustache.js
 	cp -p node_modules/requirejs/require.js js/require.js
-
-css: init
-	cp -p packages/app/css/wq.css static/app/css/wq.css
-	cp -p packages/mapbox/node_modules/mapbox-gl/dist/mapbox-gl.css static/app/css/mapbox-gl.css
-	cp -p packages/mapbox/node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css static/app/css/mapbox-gl-draw.css
 	cp -a packages/jquery-mobile/css/* css/
 	cp -p packages/app/css/app.css css/wq/app.css
 	cp -a packages/leaflet/node_modules/leaflet-draw/dist/leaflet.draw.css css/leaflet.draw.css
 	cp -a packages/leaflet/node_modules/leaflet-draw/dist/images/* css/images/
 	cp -a packages/leaflet/node_modules/leaflet/dist/leaflet.css css/leaflet.css
 	cp -a packages/leaflet/node_modules/leaflet/dist/images/* css/images/
 	cat packages/leaflet/node_modules/leaflet.markercluster/dist/*.css > css/leaflet.markercluster.css
-
-scss: init
 	cp -a packages/jquery-mobile/scss/* scss/wq/
 
 clean:
-	rm -rf js css scss
+	rm -rf js css scss static