← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python-omniorb/trusty

« back to all changes in this revision

Viewing changes to modules/dir.mk

  • Committer: Bazaar Package Importer
  • Author(s): Floris Bruynooghe
  • Date: 2011-05-01 12:42:50 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110501124250-zgkxrv9bqoy7bzm2
Tags: 3.5-2
http://bugs.debian.org/624740
* debian/omniidl-python.install: fix bug exposed by python2.5
  removal (thanks Jakub Wilk for patch) (closes: #624740)
* debian/control: bump standards version to 3.9.2, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/dir.mk
1
 
DIR_CPPFLAGS += -DOMNIPY_MAJOR=$(OMNIPY_MAJOR) -DOMNIPY_MINOR=$(OMNIPY_MINOR)
 
1
DIR_CPPFLAGS += -DOMNIPY_MAJOR=$(OMNIPY_MAJOR) -DOMNIPY_MINOR=$(OMNIPY_MINOR) \
 
2
                -DOMNIPY_VERSION_STRING='"$(OMNIPY_VERSION)"'
2
3
 
3
4
CXXSRCS = omnipy.cc \
4
5
          pyORBFunc.cc \
72
73
#CXXDEBUGFLAGS = -g
73
74
 
74
75
PYPREFIX  := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
75
 
PYDEBUG   := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
76
76
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
77
 
ifeq ($(PYDEBUG),True)
78
 
PYDEBUG   := _d
79
 
else
80
 
PYDEBUG   :=
81
 
endif
 
77
PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
 
78
PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
 
79
 
82
80
PYINCDIR  := $(PYPREFIX)/include
83
 
PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
84
 
PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
 
81
PYINCFILE := "<$(PYINCBASE)/Python.h>"
 
82
PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
85
83
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
86
84
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
87
85
 
100
98
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
101
99
endif
102
100
 
103
 
SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
104
 
SharedLibrarySoNameTemplate   = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
105
 
SharedLibraryLibNameTemplate  = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
 
101
SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
 
102
SharedLibrarySoNameTemplate   = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
 
103
SharedLibraryLibNameTemplate  = $$1$$2$(PY_SHAREDLIB_SUFFIX)
106
104
 
107
105
ifdef PythonLibraryPlatformLinkFlagsTemplate
108
106
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)