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

diff --git a/Makefile b/Makefile
index 117dad5..a88d277 100644
--- a/Makefile
+++ b/Makefile
@@ -16,54 +16,60 @@
 
 NITCOPT=
 
-all: bin/nitc bin/nitdoc doc/stdlib/index.html bin/nits
+all: tools doc/stdlib/index.html
 
-bin/nitc: c_src/nitc src/parser/parser.nit
-	@echo '***************************************************************'
-	@echo '* Compile nitc from NIT source files                          *'
-	@echo '***************************************************************'
-	src/git-gen-version.sh
-	c_src/nitc ${NITCOPT} --clibdir c_src/clib -o bin/nitc -O -v src/nitc.nit
+docs: doc/stdlib/index.html doc/nitc/index.html
+	#cd doc; make
 
-bin/nitdoc: bin/nitc
-	@echo '***************************************************************'
-	@echo '* Compile nitdoc from NIT source files                        *'
-	@echo '***************************************************************'
-	src/git-gen-version.sh
-	bin/nitc ${NITCOPT} -o bin/nitdoc -O -v src/nitdoc.nit
+tools:
+	cd src; make
 
-bin/nits: bin/nitc
-	@echo '***************************************************************'
-	@echo '* Compile nits from NIT source files                        *'
-	@echo '***************************************************************'
-	bin/nitc ${NITCOPT} -o bin/nits -O -v src/nits.nit
+bin/nitdoc:
+	cd src; make ../bin/nitdoc
 
-doc/stdlib/index.html: bin/nitdoc
-	@echo '***************************************************************'
-	@echo '* Generate doc for NIT standard library                       *'
-	@echo '***************************************************************'
-	bin/nitdoc lib/*.nit -d doc/stdlib
+bin/nitls:
+	cd src; make ../bin/nitls
 
-c_src/nitc: c_src/*.c c_src/*.h c_src/nitc._build.sh c_src/Makefile
+doc/stdlib/index.html: bin/nitdoc bin/nitls
 	@echo '***************************************************************'
-	@echo '* Compile nitc from C source files                            *'
+	@echo '* Generate doc for NIT standard library                       *'
 	@echo '***************************************************************'
-	cd c_src; make
+	bin/nitdoc $$(bin/nitls lib -r --path) -d doc/stdlib \
+		--custom-title "Nit Standard Library" \
+		--custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
+		--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/piwik/" \
+		--piwik-site-id "2"
 
-src/parser/parser.nit:
-	@echo '***************************************************************'
-	@echo '* Generate nit parser                                         *'
-	@echo '***************************************************************'
-	cd src/parser; make
+doc/nitc/index.html: bin/nitdoc
+	bin/nitdoc 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-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/piwik/" \
+		--piwik-site-id "3"
 
 clean:
 	rm -rf -- .nit_compile 2> /dev/null || true
-	cd c_src; make clean 
-	cd src/parser; make clean 
-	cd tests; make clean 
-
-dist-clean: clean
-	cd c_src; make dist-clean
-	cd src/parser; make dist-clean
-	rm -rf -- bin/nitc bin/nitdoc doc/stdlib
+	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