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

diff --git a/src/Makefile b/src/Makefile
index 46f2a26..2ca0fb7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,44 +15,38 @@
 # limitations under the License.
 
 NITCOPT=
+OLDNITCOPT= --no-stacktrace
 
-all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/nit ../bin/nitx ../bin/netdbg ../bin/dbgcli ../bin/nitdox ../bin/nitunit
+all: ../bin/nitdoc ../bin/nitmetrics ../bin/nitg ../bin/nit ../bin/nitx ../bin/nitunit ../bin/nitlight ../bin/nitls ../bin/nitdbg_client
 
-../bin/nitc: ../c_src/nitc parser/parser.nit
+nitg_0: ../c_src/nitg parser/parser.nit
 	@echo '***************************************************************'
-	@echo '* Compile nitc from NIT source files                          *'
+	@echo '* Compile nitg_0 from NIT source files                          *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../c_src/nitc ${NITCOPT} --clibdir ../c_src/clib -o ../bin/nitc -O -v nitc.nit
+	../c_src/nitg ${OLDNITCOPT} -o nitg_0 -v nitg.nit
 
-../bin/nitdoc: ../bin/nitg
+../bin/nitg: nitg_0 parser/parser.nit
 	@echo '***************************************************************'
-	@echo '* Compile nitdoc from NIT source files                        *'
+	@echo '* Compile nitg from NIT source files                          *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitdoc -v nitdoc.nit
+	./nitg_0 ${NITCOPT} -o ../bin/nitg -v nitg.nit
 
-../bin/nits: ../bin/nitg
+../bin/nitdoc: ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile nits from NIT source files                          *'
+	@echo '* Compile nitdoc from NIT source files                        *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nits -v nits.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitdoc -v nitdoc.nit
 
 ../bin/nitmetrics: ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile nitmetrics from NIT source files                      *'
+	@echo '* Compile nitmetrics from NIT source files                     *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
 	../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 -o ../bin/nitg -v nitg.nit
-
 ../bin/nit: ../bin/nitg
 	@echo '***************************************************************'
 	@echo '* Compile nit from NIT source files                           *'
@@ -60,44 +54,44 @@ all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/
 	./git-gen-version.sh
 	../bin/nitg ${NITCOPT} -o ../bin/nit -v nit.nit
 
-../bin/nitx: ../bin/nitg
+../bin/nitdbg_client : ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile nitx from NIT source files                          *'
+	@echo '* Compile nitdbg_client from NIT source files                 *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitx -v nitx.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitdbg_client -v nitdbg_client.nit
 
-../bin/nitdox: ../bin/nitg
+../bin/nitx: ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile nitdcx from NIT source files                        *'
+	@echo '* Compile nitx from NIT source files                          *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitdox -v ni_nitdoc.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitx -v nitx.nit
 
-../bin/netdbg : ../bin/nitc
+../bin/nitunit : ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile netdbg from NIT source files                          *'
+	@echo '* Compile nitunit from NIT source files                       *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitc ${NITCOPT} -o ../bin/netdbg -O -v netdbg.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitunit -v nitunit.nit
 
-../bin/dbgcli : ../bin/nitc
+../bin/nitlight : ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile dbgcli from NIT source files                          *'
+	@echo '* Compile nitlight from NIT source files                      *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitc ${NITCOPT} -o ../bin/dbgcli -O -v dbgcli.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitlight -v nitlight.nit
 
-../bin/nitunit : ../bin/nitg
+../bin/nitls : ../bin/nitg
 	@echo '***************************************************************'
-	@echo '* Compile nitunit from NIT source files                       *'
+	@echo '* Compile nitls from NIT source files                         *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitunit -v nitunit.nit
+	../bin/nitg ${NITCOPT} -o ../bin/nitls -v nitls.nit
 
-../c_src/nitc: ../c_src/*.c ../c_src/*.h ../c_src/nitc._build.sh ../c_src/Makefile
+../c_src/nitg: ../c_src/*.c ../c_src/*.h ../c_src/Makefile
 	@echo '***************************************************************'
-	@echo '* Compile nitc from C source files                            *'
+	@echo '* Compile nitg from C source files                            *'
 	@echo '***************************************************************'
 	cd ../c_src; make
 
@@ -108,7 +102,7 @@ parser/parser.nit:
 	cd parser; make
 
 clean:
-	rm -rf -- .nit_compile* nit_version.nit 2> /dev/null || true
+	rm -rf -- .nit_compile* version.nit 2> /dev/null || true
 	cd parser; make clean
 
 distclean: clean