X-Git-Url: http://nitlanguage.org?ds=sidebyside
diff --git a/Makefile b/Makefile
index 66eeea6..da0acf0 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))
-docs: doc/stdlib/index.html doc/newmodel/index.html
- #cd doc; make
+all: tools man
+
+# 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
tools:
cd src; make
@@ -27,39 +33,48 @@ 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 lib -d doc/stdlib \
--custom-title "Nit Standard Library" \
- --custom-menu-items "
Nitlanguage.org" \
+ --custom-brand "Nitlanguage.org" \
--custom-overview-text "Documentation for the standard library of Nit
Version $$(git describe)
Date: $$(git show --format="%cd" | head -1)
" \
--custom-footer-text "Nit standard library. Version $$(git describe)." \
- --source "https://github.com/privat/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L"
+ --github-upstream "nitlang:nit:master" \
+ --github-base-sha1 "$$(git rev-parse HEAD)" \
+ --github-gitdir "." \
+ --source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
+ --piwik-tracker "pratchett.info.uqam.ca/piwik/" \
+ --piwik-site-id "2" \
-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 \
+doc/nitc/index.html: bin/nitdoc bin/nitls
+ bin/nitdoc lib src/nit*.nit src/test_*.nit -d doc/nitc \
--private \
- --custom-title "Nit New Model" \
- --custom-menu-items "Nitlanguage.org" \
- --custom-overview-text "Documentation for the Nit tools based on the new metamodel
Version $$(git describe)
Date: $$(git show --format="%cd" | head -1)
" \
- --custom-footer-text "Nit new metamodel. Version $$(git describe)." \
- --github-upstream "privat:nit:master" \
+ --custom-title "Nit Compilers and Tools" \
+ --custom-brand "Nitlanguage.org" \
+ --custom-overview-text "Documentation for the Nit tools
Version $$(git describe)
Date: $$(git show --format="%cd" | head -1)
" \
+ --custom-footer-text "Nit tools. Version $$(git describe)." \
+ --github-upstream "nitlang: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"
+ --source "https://github.com/nitlang/nit/blob/$$(git rev-parse HEAD)/%f#L%l-%L" \
+ --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"; \
+ done || true