diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
| commit | ff20dd34f91fecfc351804605b822999cde0e593 (patch) | |
| tree | 9abce46a1d5403ad64bf350f6d2b5509a91e7eb6 /python | |
| parent | Fix to no longer recursively try endpoints on connection establishment (diff) | |
| download | ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.bz2 ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.xz ice-ff20dd34f91fecfc351804605b822999cde0e593.zip | |
AIX port
Diffstat (limited to 'python')
| -rw-r--r-- | python/config/Make.rules | 21 | ||||
| -rw-r--r-- | python/config/Make.rules.AIX | 25 |
2 files changed, 40 insertions, 6 deletions
diff --git a/python/config/Make.rules b/python/config/Make.rules index cb359c5a547..ee50143e17b 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -137,6 +137,10 @@ ICECPPFLAGS = -I$(slicedir) SLICE2PYFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) +ifeq ($(MAKEDEPENDFLAGS),) + MAKEDEPENDFLAGS := -MMD +endif + ifdef ice_src_dist SLICE2PY = $(PYTHON) $(top_srcdir)/config/s2py.py SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) @@ -156,9 +160,15 @@ endif # A Python extension library cannot have a "lib" prefix, so Python-specific # functions are defined that strip "lib" from the regular library name. # -mkpylibfilename = $(subst dy,dylib,$(subst lib,,$(call mklibfilename,$(1),$(2)))) -mkpysoname = $(subst dy,dylib,$(subst lib,,$(call mksoname,$(1),$(2)))) -mkpylibname = $(subst dy,dylib,$(subst lib,,$(call mklibname,$(1)))) +ifndef mkpylibfilename + mkpylibfilename = $(subst dy,dylib,$(subst lib,,$(call mklibfilename,$(1),$(2)))) +endif +ifndef mkpysoname + mkpysoname = $(subst dy,dylib,$(subst lib,,$(call mksoname,$(1),$(2)))) +endif +ifndef mkpylibname + mkpylibname = $(subst dy,dylib,$(subst lib,,$(call mklibname,$(1)))) +endif EVERYTHING = all depend clean install @@ -174,10 +184,9 @@ all:: $(SRCS) @$(SLICE2PY) $(SLICE2PYFLAGS) $< > .depend/$(*F).ice.d .cpp.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< @mkdir -p .depend - @$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $< > .depend/$(*F).d - + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(MAKEDEPENDFLAGS) $< -MF .depend/$(*F).d + clean:: -rm -f $(TARGETS) -rm -f core *.o *.pyc *.bak diff --git a/python/config/Make.rules.AIX b/python/config/Make.rules.AIX new file mode 100644 index 00000000000..71e616a0384 --- /dev/null +++ b/python/config/Make.rules.AIX @@ -0,0 +1,25 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +# +# This file is itself included by Make.rules +# + +include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) + +# +# Need .so for Python extension +# +# Note: Python also loads the extension in IcePy.a if IcePy.so points to it +# + +mkpylibfilename = $(1).so +mkylibname = $(1).so + +mkshlib = $(CXX) -qmkshrobj $(LDFLAGS) -o $(1) $(3) $(4) |