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

diff --git a/Makefile b/Makefile
index e88cd8f..66eeea6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,47 +16,50 @@
 
 NITCOPT=
 
-all: bin/nitc bin/nitdoc doc/stdlib/index.html
+all: tools doc/stdlib/index.html
 
-bin/nitc: c_src/nitc src/parser/parser.nit
-	@echo '***************************************************************'
-	@echo '* Compile nitc from NIT source files                          *'
-	@echo '***************************************************************'
-	cp c_src/nitc bin/nitc
-	bin/nitc ${NITCOPT} -o bin/nitc -O src/nitc.nit
+docs: doc/stdlib/index.html doc/newmodel/index.html
+	#cd doc; make
 
-bin/nitdoc: bin/nitc
-	@echo '***************************************************************'
-	@echo '* Compile nitdoc from NIT source files                        *'
-	@echo '***************************************************************'
-	bin/nitc ${NITCOPT} -o bin/nitdoc -O src/nitdoc.nit
+tools:
+	cd src; make
+
+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/nitdoc lib/*.nit $$(find lib/*/*.nit -maxdepth 0 -type f ) -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)." \
+		--source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L"
 
-c_src/nitc:
-	@echo '***************************************************************'
-	@echo '* Compile nitc from C source files                            *'
-	@echo '***************************************************************'
-	make -C c_src
-
-src/parser/parser.nit:
-	@echo '***************************************************************'
-	@echo '* Generate nit parser                                         *'
-	@echo '***************************************************************'
-	make -C src/parser
+doc/newmodel/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/newmodel \
+		--private \
+		--custom-title "Nit New Model" \
+		--custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
+		--custom-overview-text "<p>Documentation for the Nit tools based on the new metamodel<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
+		--custom-footer-text "Nit new metamodel. 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"
 
 clean:
 	rm -rf -- .nit_compile 2> /dev/null || true
-	make -C c_src clean 
-	make -C src/parser clean 
-	make -C tests clean 
-
-dist-clean: clean
-	make -C c_src dist-clean
-	make -C src/parser 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