update NOTICE and LICENSE

[nit.git] / Makefile

diff --git a/Makefile b/Makefile
index e88cd8f..c50281f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,41 +22,42 @@ 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
+       src/git-gen-version.sh
+       cd src; ../c_src/nitc ${NITCOPT} --clibdir ../c_src/clib -o ../bin/nitc -O -v nitc.nit
 
 bin/nitdoc: bin/nitc
        @echo '***************************************************************'
        @echo '* Compile nitdoc from NIT source files                        *'
        @echo '***************************************************************'
-       bin/nitc ${NITCOPT} -o bin/nitdoc -O src/nitdoc.nit
+       src/git-gen-version.sh
+       cd src; ../bin/nitc ${NITCOPT} -o ../bin/nitdoc -O -v nitdoc.nit
 
 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 -d doc/stdlib --public
 
-c_src/nitc:
+c_src/nitc: c_src/*.c c_src/*.h c_src/nitc._build.sh c_src/Makefile
        @echo '***************************************************************'
        @echo '* Compile nitc from C source files                            *'
        @echo '***************************************************************'
-       make -C c_src
+       cd c_src; make
 
 src/parser/parser.nit:
        @echo '***************************************************************'
        @echo '* Generate nit parser                                         *'
        @echo '***************************************************************'
-       make -C src/parser
+       cd src/parser; make
 
 clean:
        rm -rf -- .nit_compile 2> /dev/null || true
-       make -C c_src clean 
-       make -C src/parser clean 
-       make -C tests clean 
+       cd c_src; make clean 
+       cd src/parser; make clean 
+       cd tests; make clean 
 
 dist-clean: clean
-       make -C c_src dist-clean
-       make -C src/parser dist-clean
+       cd c_src; make dist-clean
+       cd src/parser; make dist-clean
        rm -rf -- bin/nitc bin/nitdoc doc/stdlib