add jarmon as a submodule

8 files changed, 26 insertions, 14 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..99584cb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "jarmon"]
+	path = jarmon
+	url = git://git.lukeshu.com/2git/jarmon
diff --git a/Makefile b/Makefile
index 2f62fac..baab91e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,17 @@
-all: public/index.html
-all: public/style.css
-all: public/jarmon-style/jquerytools.tabs.tabs-no-images.css
-all: public/jarmon-style/style.css
+srcs = $(shell find public-src -not -type d)
+outs = $(patsubst public-src/%,public/%,\
+       $(patsubst %.scss,%.css,\
+       $(patsubst %.gen,%,\
+         $(srcs))))
+all: $(outs)
+.PHONY: all
 
 NET-%:
 	date > $@
 
 .DELETE_ON_ERROR:
 .SECONDARY:
+.PHONY: FORCE
 
 # bin/
 
@@ -20,9 +24,16 @@ bin/%: bin-src/%
 
 # public/
 
+# Normal pattern rules
 public/%: public-src/%
 	@mkdir -p '$(@D)'
 	ln -srTf '$<' '$@'
+public/%: public/%.gen
+	$^ > $@
+public/%.css: public/%.scss
+	scss $< $@
+
+# Specific stuff
 
 public/index.html: public/tls.html.part public/crtsh.html.part public/diff.html.part public/jarmon.html.in
 
@@ -41,8 +52,6 @@ public/tls.html.part public/crtsh.html.part public/diff.html.part: \
 public/%.html.part: public/%.pem bin/%-pem2html
 	bin/$*-pem2html < $< > $@
 
-public/%: public/%.gen
-	$^ > $@
-
-public/%.css: public/%.scss
-	scss $< $@
+public-src/jarmon-depenencies: jarmon/docs/examples/assets/js/dependencies.js
+jarmon/docs/examples/assets/js/dependencies.js: FORCE
+	$(MAKE) -C jarmon docs/examples/assets/js/dependencies.js
diff --git a/jarmon b/jarmon
new file mode 160000
+Subproject 2836159a6a67e659e6634cc8d4505829596fc61
diff --git a/public-src/jarmon-dependencies.js b/public-src/jarmon-dependencies.js
index 9874026..cf49b55 120000
--- a/public-src/jarmon-dependencies.js
+++ b/public-src/jarmon-dependencies.js
@@ -1 +1 @@
-../graph/jarmon-git/docs/examples/assets/js/dependencies.js
\ No newline at end of file
+../jarmon/docs/examples/assets/js/dependencies.js
\ No newline at end of file
diff --git a/public-src/jarmon-style/loading.gif b/public-src/jarmon-style/loading.gif
index 03b9781..fc52d2c 120000
--- a/public-src/jarmon-style/loading.gif
+++ b/public-src/jarmon-style/loading.gif
@@ -1 +1 @@
-../../graph/jarmon-git/docs/examples/assets/icons/loading.gif
\ No newline at end of file
+../../jarmon/docs/examples/assets/icons/loading.gif
\ No newline at end of file
diff --git a/public-src/jarmon-style/next.gif b/public-src/jarmon-style/next.gif
index 16a6d9d..8b08c07 120000
--- a/public-src/jarmon-style/next.gif
+++ b/public-src/jarmon-style/next.gif
@@ -1 +1 @@
-../../graph/jarmon-git/docs/examples/assets/icons/next.gif
\ No newline at end of file
+../../jarmon/docs/examples/assets/icons/next.gif
\ No newline at end of file
diff --git a/public-src/jarmon-style/prev.gif b/public-src/jarmon-style/prev.gif
index 72199f2..4c1ad5b 120000
--- a/public-src/jarmon-style/prev.gif
+++ b/public-src/jarmon-style/prev.gif
@@ -1 +1 @@
-../../graph/jarmon-git/docs/examples/assets/icons/prev.gif
\ No newline at end of file
+../../jarmon/docs/examples/assets/icons/prev.gif
\ No newline at end of file
diff --git a/public-src/jarmon.js b/public-src/jarmon.js
index 1c0e4a9..d8eb9e7 120000
--- a/public-src/jarmon.js
+++ b/public-src/jarmon.js
@@ -1 +1 @@
-../graph/jarmon-git/jarmon/jarmon.js
\ No newline at end of file
+../jarmon/jarmon/jarmon.js
\ No newline at end of file