Re-order COMPONENTS

[mkws-moved-to-github.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 3b8b7b8..f69fa5e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,9 +9,7 @@ HANDLEBARS_URL= http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.
 PP2_URL=       http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD
 VERSION = $(shell tr -d '\012' < VERSION)
 
-COMPONENTS = mkws-core.js
-
-MKWS_JS=       mkws-complete.js
+COMPONENTS = mkws-handlebars.js mkws-core.js mkws-team.js mkws-widgets.js mkws-widget-authname.js
 
 JQUERY_FILE := $(shell basename ${JQUERY_URL})
 JQUERY_JSON_FILE := $(shell basename ${JQUERY_JSON_URL})
@@ -30,9 +28,7 @@ uninstall:
        rm -f $(INSTALLED)
 
 ../tools/htdocs/%: %
-       rm -f $@
-       cp -p $? $@
-       chmod -w $@
+       rm -f $@ && cp -p $? $@ && chmod -w $@
 
 all: mkws.min.js mkws-complete.min.js
 
@@ -88,7 +84,7 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
                echo "Made release $(VERSION)"; \
        fi
 
-mkws.js: $(COMPONENTS)
+mkws.js: $(COMPONENTS) Makefile
        rm -f $@
        cat $(COMPONENTS) > $@
        chmod -w $@