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

diff --git a/src/Makefile b/src/Makefile
index e24d047..eb02ada 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,62 +14,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-NITCOPT=
+NITCOPT=--semi-global
+OLDNITCOPT=
+OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial
+SRCS=$(patsubst %,%.nit,$(OBJS))
+BINS=$(patsubst %,../bin/%,$(OBJS))
 
-all: ../bin/nitdoc ../bin/nitmetrics ../bin/nitg ../bin/nit ../bin/nitx ../bin/nitunit ../bin/nitlight
+all: $(BINS)
 
-../bin/nitg: ../c_src/nitg parser/parser.nit
+nitc_0: ../c_src/nitg parser/parser.nit
 	@echo '***************************************************************'
-	@echo '* Compile nitg from NIT source files                          *'
+	@echo '* Compile nitc_0 from NIT source files                        *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
-	../c_src/nitg ${NITCOPT} -o ../bin/nitg -v nitg.nit
+	../c_src/nitg ${OLDNITCOPT} -o nitc_0 -v nitc.nit
 
-../bin/nitdoc: ../bin/nitg
+$(BINS): nitc_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/nitg ${NITCOPT} -o ../bin/nitdoc -v nitdoc.nit
+	./nitc_0 ${NITCOPT} -v --dir ../bin $(SRCS)
 
-../bin/nitmetrics: ../bin/nitg
-	@echo '***************************************************************'
-	@echo '* Compile nitmetrics from NIT source files                      *'
-	@echo '***************************************************************'
-	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitmetrics -v nitmetrics.nit
-
-../bin/nit: ../bin/nitg
-	@echo '***************************************************************'
-	@echo '* Compile nit from NIT source files                           *'
-	@echo '***************************************************************'
-	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nit -v nit.nit
-
-../bin/nitx: ../bin/nitg
-	@echo '***************************************************************'
-	@echo '* Compile nitx from NIT source files                          *'
-	@echo '***************************************************************'
+$(OBJS): nitc_0 parser/parser.nit
 	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitx -v nitx.nit
-
-../bin/nitunit : ../bin/nitg
-	@echo '***************************************************************'
-	@echo '* Compile nitunit from NIT source files                       *'
-	@echo '***************************************************************'
-	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitunit -v nitunit.nit
-
-../bin/nitlight : ../bin/nitg
-	@echo '***************************************************************'
-	@echo '* Compile nitlight from NIT source files                      *'
-	@echo '***************************************************************'
-	./git-gen-version.sh
-	../bin/nitg ${NITCOPT} -o ../bin/nitlight -v nitlight.nit
+	./nitc_0 ${NITCOPT} -v $@.nit
 
 ../c_src/nitg: ../c_src/*.c ../c_src/*.h ../c_src/Makefile
 	@echo '***************************************************************'
-	@echo '* Compile nitg from C source files                            *'
+	@echo '* Compile nitc from C source files                            *'
 	@echo '***************************************************************'
 	cd ../c_src; make
 
@@ -80,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 nitc_0 2> /dev/null || true
 	cd parser; make clean
-
-distclean: clean
-	cd parser; make distclean