debugging galore

[rrq/hourglass.git] / Makefile

diff --git a/Makefile b/Makefile
index 17745a12e6a065dfeee5c2846c80737d4f357fe7..7c058ba07ae4666e8b444bc97a6514cf73ed2c2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ MAIN = command.lsp
 LSP = $(filter-out $(MAIN),$(wildcard *.lsp))
 BIN = hourglass hourglass-web
 DOCS = hourglass-guide.html hourglass-guide.pdf
+IMGS = $(wildcard *.png)
 OTHER = setup.sh hourglass.conf
 VERSION = 0.1
 
@@ -10,20 +11,19 @@ dist: hourglass-$(VERSION).tgz
 hourglass: $(MAIN) $(LSP)
        packnl -w $@ $^
 
-hourglass-web:
+hourglass-web: manager siteconfig.lsp
        $(MAKE) -C manager
        mv manager/$@ $@
 
-hourglass-$(VERSION).tgz: $(BIN) $(OTHER) $(DOCS)
+hourglass-$(VERSION).tgz: $(BIN) $(OTHER) $(DOCS) $(IMGS)
        tar czf $@ $^
 
 %.html: %.adoc
        asciidoctor $< > $@
 
-hourglass-guide.pdf: $(wildcard *.png)
-
-%.pdf: %.adoc
+%.pdf: %.adoc | $(IMGS)
        asciidoctor-pdf $< > $@
 
 clean:
+       $(MAKE) -C manager clean
        rm -f $(BIN) hourglass-$(VERSION).tgz