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

diff --git a/src/Makefile b/src/Makefile
index 8440ee7..2f3d7a1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,33 +15,34 @@
 # limitations under the License.
 
 NITCOPT=
+OLDNITCOPT=
+OBJS=nitg nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial
+SRCS=$(patsubst %,%.nit,$(OBJS))
+BINS=$(patsubst %,../bin/%,$(OBJS))
 
-all: ../bin/nitc ../bin/nitdoc ../bin/nits
+all: $(BINS)
 
-../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/nitc
+$(BINS): nitg_0 parser/parser.nit
 	@echo '***************************************************************'
-	@echo '* Compile nitdoc from NIT source files                        *'
+	@echo '* Compile binaries from NIT source files                      *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../bin/nitc ${NITCOPT} -o ../bin/nitdoc -O -v nitdoc.nit
+	./nitg_0 ${NITCOPT} -v --dir ../bin $(SRCS)
 
-../bin/nits: ../bin/nitc
-	@echo '***************************************************************'
-	@echo '* Compile nits from NIT source files                        *'
-	@echo '***************************************************************'
+$(OBJS): nitg_0 parser/parser.nit
 	./git-gen-version.sh
-	../bin/nitc ${NITCOPT} -o ../bin/nits -O -v nits.nit
+	./nitg_0 ${NITCOPT} -v $@.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
 
@@ -52,8 +53,5 @@ parser/parser.nit:
 	cd parser; make
 
 clean:
-	rm -rf -- .nit_compile* nit_version.nit 2> /dev/null || true
+	rm -rf -- .nit_compile* version.nit nitg_0 2> /dev/null || true
 	cd parser; make clean
-
-distclean: clean
-	cd parser; make distclean