1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
Description: Enable building for debug builds of python
This allows one to build the modules for pydebug builds in the same
tree as the normal build by following normal distutils filename
convetions for pydebug extension modules (adding _d to the name).
Forwarded: http://www.omniorb-support.com/pipermail/omniorb-list/2010-January/030475.html
Author: Floris Bruynooghe <flub@devork.be>
Last-Update: 2010-08-09
--- a/examples/embed/dir.mk
+++ b/examples/embed/dir.mk
@@ -16,8 +16,11 @@
CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
+PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
+
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCFILE := "<$(PYINCBASE)/Python.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
endif
@@ -26,9 +29,9 @@
namespec := _embedmodule _ 1 0
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/codesets/dir.mk
+++ b/modules/codesets/dir.mk
@@ -22,9 +22,12 @@
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
+PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
+
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<$(PYINCBASE)/Python.h>"
+PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -43,9 +46,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/connections/dir.mk
+++ b/modules/connections/dir.mk
@@ -20,9 +20,12 @@
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
+PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
+
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<$(PYINCBASE)/Python.h>"
+PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -50,9 +53,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/dir.mk
+++ b/modules/dir.mk
@@ -74,9 +74,12 @@
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
+PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
+
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<$(PYINCBASE)/Python.h>"
+PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -95,9 +98,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/sslTP/dir.mk
+++ b/modules/sslTP/dir.mk
@@ -21,9 +21,12 @@
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
+PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
+
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<$(PYINCBASE)/Python.h>"
+PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -45,9 +48,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
|
