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

diff --git a/src/Makefile b/src/Makefile
index e00c83d..72aaaa3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,12 +15,18 @@
 # limitations under the License.
 
 NITCOPT=--semi-global
-OLDNITCOPT=
-OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitdbg_client nitserial
+OLDNITCOPT=--semi-global
+OBJS=nitc nitpick nit nitdoc nitls nitunit nitpretty nitmetrics nitx nitlight nitserial nitrestful
 SRCS=$(patsubst %,%.nit,$(OBJS))
 BINS=$(patsubst %,../bin/%,$(OBJS))
 
-all: $(BINS)
+# Workaround: Cygwin requires peflags to bootstrap
+peflags := ${shell which peflags 2>/dev/null}
+
+all: bin/nitc
+
+pre-build:
+	./git-gen-version.sh
 
 nitc_0: ../c_src/nitc parser/parser.nit
 	@echo '***************************************************************'
@@ -28,14 +34,17 @@ nitc_0: ../c_src/nitc parser/parser.nit
 	@echo '***************************************************************'
 	./git-gen-version.sh
 	../c_src/nitc ${OLDNITCOPT} -o nitc_0 -v nitc.nit
+ifdef peflags
+	${peflags} --cygwin-heap=2048 nitc_0
+endif
 
-$(BINS): nitc_0 parser/parser.nit
+bin/nitc: nitc_0 parser/parser.nit
 	@echo '***************************************************************'
 	@echo '* Compile binaries from NIT source files                      *'
 	@echo '***************************************************************'
 	./git-gen-version.sh
+	test -d ../bin || mkdir ../bin
 	./nitc_0 ${NITCOPT} -v --dir ../bin $(SRCS)
-	rm -r .nit_compile || true # to clean old .nit_compile generated file
 
 $(OBJS): nitc_0 parser/parser.nit
 	./git-gen-version.sh
@@ -47,6 +56,9 @@ $(OBJS): nitc_0 parser/parser.nit
 	@echo '***************************************************************'
 	cd ../c_src; make
 	rm ../c_src/*.o || true # to reduce disc used
+ifdef peflags
+	${peflags} --cygwin-heap=2048 ../c_src/nitc
+endif
 
 parser/parser.nit:
 	@echo '***************************************************************'