X-Git-Url: http://nitlanguage.org diff --git a/src/Makefile b/src/Makefile index c78e41b..b46e488 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,37 +14,39 @@ # See the License for the specific language governing permissions and # limitations under the License. -NITCOPT= -OLDNITCOPT= -OBJS=nitdoc nitmetrics nitg nit nitx nitunit nitlight nitls nitdbg_client +NITCOPT=--semi-global +OLDNITCOPT=--semi-global +OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial SRCS=$(patsubst %,%.nit,$(OBJS)) BINS=$(patsubst %,../bin/%,$(OBJS)) -all: $(BINS) +all: bin/nitc -nitg_0: ../c_src/nitg parser/parser.nit +nitc_0: ../c_src/nitc parser/parser.nit @echo '***************************************************************' - @echo '* Compile nitg_0 from NIT source files *' + @echo '* Compile nitc_0 from NIT source files *' @echo '***************************************************************' ./git-gen-version.sh - ../c_src/nitg ${OLDNITCOPT} -o nitg_0 -v nitg.nit + ../c_src/nitc ${OLDNITCOPT} -o nitc_0 -v nitc.nit -$(BINS): nitg_0 parser/parser.nit +bin/nitc: nitc_0 parser/parser.nit @echo '***************************************************************' @echo '* Compile binaries from NIT source files *' @echo '***************************************************************' ./git-gen-version.sh - ./nitg_0 ${NITCOPT} -v --dir ../bin $(SRCS) + test -d ../bin || mkdir ../bin + ./nitc_0 ${NITCOPT} -v --dir ../bin $(SRCS) -$(OBJS): nitg_0 parser/parser.nit +$(OBJS): nitc_0 parser/parser.nit ./git-gen-version.sh - ./nitg_0 ${NITCOPT} -v $@.nit + ./nitc_0 ${NITCOPT} -v $@.nit -../c_src/nitg: ../c_src/*.c ../c_src/*.h ../c_src/Makefile +../c_src/nitc: ../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 + rm ../c_src/*.o || true # to reduce disc used parser/parser.nit: @echo '***************************************************************' @@ -53,8 +55,5 @@ parser/parser.nit: cd parser; make clean: - rm -rf -- .nit_compile* version.nit 2> /dev/null || true + rm -rf -- version.nit nitc_0 2> /dev/null || true cd parser; make clean - -distclean: clean - cd parser; make distclean