>From 46e563f1b27754664f2bac3457046158cb96a5c1 Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Wed, 4 May 2011 11:46:57 +0200 Subject: [PATCH 4/6] Rename clrmodule.il in the Makefile build to clrmodule_make.il. clrmodule.il is used by the Visual Studio project and therefore in the source distribution. However, this means that the Makefile will not create the correct clrmodule.il if a realclean is not run beforehands. --- Makefile | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7de3255..212e54a 100644 --- a/Makefile +++ b/Makefile @@ -76,18 +76,18 @@ Python.Runtime.dll: $(RUNTIME_CS) $(RUNTIME_REF) /out:../../Python.Runtime.dll /recurse:*.cs # Contributed by VIKAS DHIMAN - - Thanks, Vikas! -src/runtime/clrmodule.il: src/runtime/clrmodule.pp.il +src/runtime/clrmodule_make.il: src/runtime/clrmodule.pp.il ifeq ($(origin WINDIR), undefined) cd "$(BASEDIR)/src/runtime";\ - $(CPP) -C -P -x c++ $(CFLAGS_CLR_$(ARCH)) clrmodule.pp.il -o clrmodule.il + $(CPP) -C -P -x c++ $(CFLAGS_CLR_$(ARCH)) clrmodule.pp.il -o clrmodule_make.il else cd "$(BASEDIR)/src/runtime";\ - cp oldmodule.il clrmodule.il + cp oldmodule.il clrmodule_make.il endif -clr.pyd: Python.Runtime.dll src/runtime/clrmodule.il +clr.pyd: Python.Runtime.dll src/runtime/clrmodule_make.il $(ILASM) /nologo /dll /quiet /output=clr.pyd \ - src/runtime/clrmodule.il + src/runtime/clrmodule_make.il clr.so: Python.Runtime.dll src/monoclr/clrmod.c src/monoclr/pynetclr.h \ @@ -109,6 +109,7 @@ Python.EmbeddingTest.dll: Python.Runtime.dll $(EMBED_CS) .PHONY=clean clean: + -rm src/runtime/clrmodule_make.il rm -f *.exe *.dll *.so *.pyd make -C src/monoclr clean -- 1.7.5