X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=bc7ef19521dab9bd1d39d7b0b08aff43064224f8;hp=9737f179d4fd2e99954656da99432aac033f1fb7;hb=38681173648abc43ba6861c8a14fa47041a4811e;hpb=5d4a56ce00ebbf1b4e1c37add8cd217a5507a17a diff --git a/src/Makefile b/src/Makefile index 9737f17..bc7ef19 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,7 @@ COMPONENTS = mkws-handlebars.js \ 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-builder.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 @@ -41,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 ',')"; \ echo "*/"; \ cat ${JQUERY_FILE}; \ cat ${JQUERY_JSON_FILE}; \ + echo 'mkws_jQuery = jQuery.noConflict(true);'; \ cat ${HANDLEBARS_FILE}; \ cat ${PP2_FILE}; \ cat mkws.js; \