tools: use nitg to compile most tools

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/Makefile b/src/Makefile
index 1801a9b..bbba7ee 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,40 +25,40 @@ all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/
        ./git-gen-version.sh
        ../c_src/nitc ${NITCOPT} --clibdir ../c_src/clib -o ../bin/nitc -O -v nitc.nit
 
-../bin/nitdoc: ../bin/nitc
+../bin/nitdoc: ../bin/nitg
        @echo '***************************************************************'
        @echo '* Compile nitdoc from NIT source files                        *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nitdoc -O -v nitdoc.nit
+       ../bin/nitg ${NITCOPT} -o ../bin/nitdoc -v nitdoc.nit
 
-../bin/nits: ../bin/nitc
+../bin/nits: ../bin/nitg
        @echo '***************************************************************'
        @echo '* Compile nits from NIT source files                          *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nits -O -v nits.nit
+       ../bin/nitg ${NITCOPT} -o ../bin/nits -v nits.nit
 
-../bin/nitmetrics: ../bin/nitc
+../bin/nitmetrics: ../bin/nitg
        @echo '***************************************************************'
        @echo '* Compile nitmetrics from NIT source files                      *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nitmetrics -O -v nitmetrics.nit
+       ../bin/nitg ${NITCOPT} -o ../bin/nitmetrics -v nitmetrics.nit
 
 ../bin/nitg: ../bin/nitc
        @echo '***************************************************************'
        @echo '* Compile nitg from NIT source files                          *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nitg -O -v nitg.nit
+       ../bin/nitc ${NITCOPT} -o ../bin/nitg -v nitg.nit
 
-../bin/nit: ../bin/nitc
+../bin/nit: ../bin/nitg
        @echo '***************************************************************'
        @echo '* Compile nit from NIT source files                           *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nit -O -v nit.nit
+       ../bin/nitg ${NITCOPT} -o ../bin/nit -v nit.nit
 
 ../c_src/nitc: ../c_src/*.c ../c_src/*.h ../c_src/nitc._build.sh ../c_src/Makefile
        @echo '***************************************************************'

diff --git a/src/ngall.sh b/src/ngall.sh
index b533848..f2d7bde 100755 (executable)
--- a/src/ngall.sh
+++ b/src/ngall.sh
@@ -3,7 +3,7 @@ rm nitg nitg.bin hello_world.bin 2>/dev/null
 #test -f nitc_3 || { ./nitc_3 ; exit }
 set -x
 set -e
-time ./nitc_3 -O nitg.nit -v
+time ../bin/nitc -O nitg.nit -v
 time ./nitg nitg.nit -v "$@"
 time ./nitg.bin nitg.nit -v "$@"
 time ./nitg.bin nitg.nit -v "$@"