X-Git-Url: http://nitlanguage.org

diff --git a/Makefile b/Makefile
index dd9824e..326d49b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,16 @@
 
 NITCOPT=
 
-all: tools doc/stdlib/index.html
+# Additional program directories (contrib and examples) that are buildable
+PROGS=$(dir $(wildcard examples/*/Makefile contrib/*/Makefile))
+
+all: tools
+
+# Compile all programs in $PROGS
+full: all
+	for m in $(PROGS); do $(MAKE) -C "$$m" || exit 1; done
 
 docs: doc/stdlib/index.html doc/nitc/index.html
-	#cd doc; make
 
 tools:
 	cd src; make
@@ -27,46 +33,50 @@ tools:
 bin/nitdoc:
 	cd src; make ../bin/nitdoc
 
-doc/stdlib/index.html: bin/nitdoc
+bin/nitls:
+	cd src; make ../bin/nitls
+
+doc/stdlib/index.html: bin/nitdoc bin/nitls
 	@echo '***************************************************************'
 	@echo '* Generate doc for NIT standard library                       *'
 	@echo '***************************************************************'
-	bin/nitdoc lib/*.nit $$(find lib/*/*.nit -maxdepth 0 -type f ) -d doc/stdlib \
+	bin/nitdoc $$(bin/nitls lib -rs --path) -d doc/stdlib \
 		--custom-title "Nit Standard Library" \
-		--custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
+		--custom-brand "<a href=\"http://nitlanguage.org/\">Nitlanguage.org</a>" \
 		--custom-overview-text "<p>Documentation for the standard library of Nit<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
 		--custom-footer-text "Nit standard library. Version $$(git describe)." \
 		--github-upstream "privat:nit:master" \
 		--github-base-sha1 "$$(git rev-parse HEAD)" \
 		--github-gitdir "." \
 		--source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
-		--piwik-tracker "pratchett.info.uqam.ca/~terrasa/piwik/" \
-		--piwik-site-id "2"
+		--piwik-tracker "pratchett.info.uqam.ca/piwik/" \
+		--piwik-site-id "2" \
 
-doc/nitc/index.html: bin/nitdoc
-	bin/nitdoc src/nit.nit src/nitmetrics.nit src/nitg.nit src/nitx.nit src/nitunit.nit src/nitlight.nit src/dbgcli.nit src/netdbg.nit -d doc/nitc \
+doc/nitc/index.html: bin/nitdoc bin/nitls
+	bin/nitdoc $$(bin/nitls lib -rs --path) src/nit*.nit src/test_*.nit -d doc/nitc \
 		--private \
 		--custom-title "Nit Compilers and Tools" \
-		--custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
+		--custom-brand "<a href=\"http://nitlanguage.org/\">Nitlanguage.org</a>" \
 		--custom-overview-text "<p>Documentation for the Nit tools<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
 		--custom-footer-text "Nit tools. Version $$(git describe)." \
 		--github-upstream "privat:nit:master" \
 		--github-base-sha1 "$$(git rev-parse HEAD)" \
 		--github-gitdir "." \
 		--source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
-		--piwik-tracker "pratchett.info.uqam.ca/~terrasa/piwik/" \
+		--piwik-tracker "pratchett.info.uqam.ca/piwik/" \
 		--piwik-site-id "3"
 
+man:
+	$(MAKE) -C share/man
+
 clean:
 	rm -rf -- .nit_compile 2> /dev/null || true
+	rm -rf -- doc/stdlib doc/nitc || true
 	cd c_src; make clean
 	cd src; make clean
-	cd doc; make clean
 	cd tests; make clean
-
-distclean: clean
-	rm -rf -- bin/nitdoc bin/nits doc/stdlib 2> /dev/null || true
-	cd c_src; make distclean
-	cd src/parser; make distclean
-	cd doc; make distclean
-	cd tests; make distclean
+	cd share/man; make clean
+	for m in $(PROGS); do \
+		$(MAKE) clean -C "$$m"; \
+		test -d $$m/.nit_compile && rm -r $$m/.nit_compile; \
+		done || true