# HG changeset patch
# Parent af793c7580f1f26a008f5944db42bccd505e6dda
diff -r af793c7580f1 -r f00e9559cf43 Modules/Setup.dist
--- a/Modules/Setup.dist	Wed Jun 17 10:09:24 2015 -0500
+++ b/Modules/Setup.dist	Thu Jun 18 05:00:06 2015 +0000
@@ -169,8 +169,8 @@
 # Modules that should always be present (non UNIX dependent):
 
 #array arraymodule.c	# array objects
-#cmath cmathmodule.c _math.c # -lm # complex math library functions
-#math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
+#cmath cmathmodule.c # -lm # complex math library functions
+#math mathmodule.c # -lm # math library functions, e.g. sin()
 #_struct _struct.c	# binary structure packing/unpacking
 #_weakref _weakref.c	# basic weak reference support
 #_testcapi _testcapimodule.c    # Python C API test module
diff -r af793c7580f1 -r f00e9559cf43 Modules/cmathmodule.c
--- a/Modules/cmathmodule.c	Wed Jun 17 10:09:24 2015 -0500
+++ b/Modules/cmathmodule.c	Thu Jun 18 05:00:06 2015 +0000
@@ -8,6 +8,8 @@
    float.h.  We assume that FLT_RADIX is either 2 or 16. */
 #include <float.h>
 
+#include "_math.c"  /* Also compiled into "math" module */
+
 #include "clinic/cmathmodule.c.h"
 /*[clinic input]
 module cmath
diff -r af793c7580f1 -r f00e9559cf43 Modules/mathmodule.c
--- a/Modules/mathmodule.c	Wed Jun 17 10:09:24 2015 -0500
+++ b/Modules/mathmodule.c	Thu Jun 18 05:00:06 2015 +0000
@@ -55,6 +55,8 @@
 #include "Python.h"
 #include "_math.h"
 
+#include "_math.c"  /* Also compiled into "cmath" module */
+
 /*
    sin(pi*x), giving accurate results for all finite x (especially x
    integral or close to an integer).  This is here for use in the
diff -r af793c7580f1 -r f00e9559cf43 PCbuild/pythoncore.vcxproj
--- a/PCbuild/pythoncore.vcxproj	Wed Jun 17 10:09:24 2015 -0500
+++ b/PCbuild/pythoncore.vcxproj	Thu Jun 18 05:00:06 2015 +0000
@@ -168,6 +168,7 @@
     <ClInclude Include="..\Include\unicodeobject.h" />
     <ClInclude Include="..\Include\weakrefobject.h" />
     <ClInclude Include="..\Modules\_math.h" />
+    <ClInclude Include="..\Modules\_math.c" />
     <ClInclude Include="..\Modules\hashtable.h" />
     <ClInclude Include="..\Modules\rotatingtree.h" />
     <ClInclude Include="..\Modules\sre.h" />
@@ -221,7 +222,6 @@
     <ClCompile Include="..\Modules\_json.c" />
     <ClCompile Include="..\Modules\_localemodule.c" />
     <ClCompile Include="..\Modules\_lsprof.c" />
-    <ClCompile Include="..\Modules\_math.c" />
     <ClCompile Include="..\Modules\_pickle.c" />
     <ClCompile Include="..\Modules\_randommodule.c" />
     <ClCompile Include="..\Modules\_sre.c" />
diff -r af793c7580f1 -r f00e9559cf43 PCbuild/pythoncore.vcxproj.filters
--- a/PCbuild/pythoncore.vcxproj.filters	Wed Jun 17 10:09:24 2015 -0500
+++ b/PCbuild/pythoncore.vcxproj.filters	Thu Jun 18 05:00:06 2015 +0000
@@ -464,9 +464,6 @@
     <ClCompile Include="..\Modules\_lsprof.c">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\_math.c">
-      <Filter>Modules</Filter>
-    </ClCompile>
     <ClCompile Include="..\Modules\_pickle.c">
       <Filter>Modules</Filter>
     </ClCompile>
diff -r af793c7580f1 -r f00e9559cf43 setup.py
--- a/setup.py	Wed Jun 17 10:09:24 2015 -0500
+++ b/setup.py	Thu Jun 18 05:00:06 2015 +0000
@@ -583,12 +583,12 @@
         # array objects
         exts.append( Extension('array', ['arraymodule.c']) )
         # complex math library functions
-        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
-                               depends=['_math.h'],
+        exts.append( Extension('cmath', ['cmathmodule.c'],
+                               depends=['_math.h', '_math.c'],
                                libraries=math_libs) )
         # math library functions, e.g. sin()
-        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
-                               depends=['_math.h'],
+        exts.append( Extension('math',  ['mathmodule.c'],
+                               depends=['_math.h', '_math.c'],
                                libraries=math_libs) )
 
         # time libraries: librt may be needed for clock_gettime()