Move external resources to "lib" folder, update makefile

1 files changed, 12 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index b2d0adc..c3f5d79 100644
--- a/Makefile
+++ b/Makefile
@@ -21,15 +21,20 @@ all: script/ousia.js style/style.css $(TARGET_XML) $(TARGET_HTML)
 # On Fedora you can install lessc using the following commands (as root):
 #     yum install nodejs npm
 #     npm install -g less less-plugin-clean-css
-style/style.css: style/*.less
-	lessc style/style.less style/style.css --clean-css="--s1"
+style/style.css: style/*.less style/lib/*.css
+	lessc \
+		style/style.less \
+		style/style.css --clean-css="--s1"
 
 # Build the JavaScript using uglifyjs
 # On Fedora you can install uglifyjs using the following commands (as root):
 #     yum install nodejs npm
 #     npm install -g uglifyjs
-script/ousia.js: script/prism.js script/prism_bash.js script/highlight.js
-	uglifyjs script/prism.js script/prism_bash.js script/highlight.js > script/ousia.js
+script/ousia.js: script/lib/*.js
+	uglifyjs \
+		script/lib/prism.js \
+		script/lib/prism_bash.js \
+		script/highlight.js > script/ousia.js
 
 # Compile all osml files to xml
 %.xml: %.osml ontology/*.osml
@@ -42,6 +47,7 @@ script/ousia.js: script/prism.js script/prism_bash.js script/highlight.js
 # Clean script, remove all target files
 clean:
 	rm -f style/*.css
+	rm -f script/ousia.js
 	rm -f $(TARGET_HTML)
 	rm -f $(TARGET_XML)
 	rm -f *~ style/*~ ontology/*~ xsl/*~
@@ -57,6 +63,8 @@ webclean:
 	test ! -e .git
 	find style/ -type f -not -name "style.css" -delete
 	find script/ -type f -not -name "ousia.js" -delete
+	rmdir script/lib
+	rmdir style/lib
 	rm -f $(TARGET_XML)
 	rm -f $(SOURCE_OSML)
 	rm -rf ontology www-src