keep directoy ./src/releases in git

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

diff --git a/src/Makefile b/src/Makefile
index 43eeadb..bc7ef19 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,14 +12,16 @@ JQUERY_UI_URL =     http://code.jquery.com/ui/1.10.3/jquery-ui.js
 VERSION = $(shell tr -d '\012' < VERSION)
 
 COMPONENTS = mkws-handlebars.js \
-       mkws-core.js mkws-team.js mkws-widgets.js mkws-widget-termlists.js \
-       mkws-widget-authname.js mkws-widget-log.js mkws-widget-record.js \
-       mkws-widget-builder.js
-
-INSTALLABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
-       mkws.js mkws-jquery.js mkws-complete.js \
-       mkws.min.js mkws-complete.min.js \
-       VERSION NEWS
+       mkws-core.js mkws-team.js mkws-filter.js \
+       mkws-widget.js mkws-widget-main.js mkws-widget-termlists.js \
+       mkws-widget-authname.js mkws-widget-categories.js mkws-widget-log.js \
+       mkws-widget-record.js mkws-widget-reference.js mkws-widget-builder.js
+
+GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
+       mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+
+INSTALLABLE = mkws-jquery.js VERSION NEWS $(GENERATED)
+
 INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
 
 **make-default**: ../tools/htdocs/mkws.js
@@ -39,11 +41,12 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
          echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
          echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
          echo "   created at: $$(date)"; \
-         echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
+         echo "   MKWS GIT id: $$(git show | head -n 1 | perl -npe 's,\S+\s+,,')"; \
          echo "   pz2.js GIT id: $$(curl -sSf 'http://git.indexdata.com/?p=pazpar2.git;a=rss' | egrep '<guid' | head -1 | perl -ne 'print "$$1\n" if m,.*=([0-9a-f]+)</guid>,')"; \
          echo "*/"; \
          cat ${JQUERY_FILE}; \
          cat ${JQUERY_JSON_FILE}; \
+         echo 'mkws_jQuery = jQuery.noConflict(true);'; \
          cat ${HANDLEBARS_FILE}; \
          cat ${PP2_FILE}; \
          cat  mkws.js; \
@@ -95,6 +98,5 @@ distclean: clean
        rm -f *.orig *.bak *.rej
 
 clean:
-       rm -f ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
-       rm -f mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+       rm -f ${GENERATED}