From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 23 Jun 2012 17:51:48 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0b1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c30ee1bd8029182f10b05799814251ccf5b93c9;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

2c30ee1bd8029182f10b05799814251ccf5b93c9
diff --cc PC/python3.mak
index ce65fba134bd,a7f01cbd9e40..aa5bd0270c39
--- a/PC/python3.mak
+++ b/PC/python3.mak
@@@ -1,10 -1,10 +1,10 @@@
- $(OutDir)python33.dll:	python3.def $(OutDir)python33stub.lib
+ $(OutDir)python3.dll:	python3.def $(OutDir)python32stub.lib
 -	cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python32stub.lib
 +	cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib
  
 -$(OutDir)python32stub.lib:	python32stub.def
 -	lib /def:python32stub.def /out:$(OutDir)python32stub.lib /MACHINE:$(MACHINE)
 +$(OutDir)python33stub.lib:	python33stub.def
 +	lib /def:python33stub.def /out:$(OutDir)python33stub.lib /MACHINE:$(MACHINE)
  
  clean:
 -	del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python32stub.lib $(OutDir)python3.exp $(OutDir)python32stub.exp
 +	del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp
  
- rebuild: clean $(OutDir)python33.dll
+ rebuild: clean $(OutDir)python3.dll