X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=961fc51bec3a7df6d5ffbe622dca8d6c1167f0f6;hb=57c5bcefb1eac66d1db27db28a0c6d3b3b52a407;hp=38fde28e48c4e7e53e80ad31b67200eea1276087;hpb=1c3f2ffe56800f166095d0b7c0011a6202b0bb4d;p=myslice.git diff --git a/Makefile b/Makefile index 38fde28e..961fc51b 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL = /bin/bash + MAKE-SILENT = $(MAKE) --no-print-directory ### first purpose, build and install from the specfile @@ -30,15 +32,24 @@ THIRD-PARTY-RESOURCES = THIRD-PARTY-RESOURCES += $(shell ls third-party/bootstrap/*/*) # just the single js as identified with a symlink THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.bootstrap.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/css/dataTables.bootstrap.css) # likewise THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.js) -# used in hazelnut -THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-ui/themes/base/jquery-ui.css) +THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.min.js) +# for storing the visible status of plugins +THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage.min.js) # spin comes in plain or min, + the jquery plugin, and our own settings THIRD-PARTY-RESOURCES += $(shell ls third-party/spin/*.js) # used in QueryCode -THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/sh{Core,Autoloader,BrushPython,BrushRuby}.js) -THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/sh{Core,CoreDefault,ThemeDefault}.css) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shCore.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shAutoloader.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushPython.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/scripts/shBrushRuby.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCore.css) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shCoreDefault.css) +THIRD-PARTY-RESOURCES += $(shell ls third-party/syntaxhighlighter/styles/shThemeDefault.css) thirdparty-js: