diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/Makefile.mk | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/python/Makefile b/python/Makefile index c94798c58d1..13d0972180e 100644 --- a/python/Makefile +++ b/python/Makefile @@ -15,7 +15,7 @@ include $(top_srcdir)/config/Make.rules # # Load C++ dependencies # -$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,IceUtil Slice Ice IceSSL))) +$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL))) # # Load python rules after loading C++ dependencies diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk index 641e749363e..3a53715194b 100644 --- a/python/modules/IcePy/Makefile.mk +++ b/python/modules/IcePy/Makefile.mk @@ -7,15 +7,21 @@ # # ********************************************************************** -$(project)_libraries := IcePy +$(project)_libraries := IcePy IcePy_target := python-module IcePy_targetname := IcePy IcePy_targetdir := $(lang_srcdir)/python IcePy_installdir := $(install_pythondir) -IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated $(python_cppflags) +IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ + -I$(top_srcdir)/cpp/src -DSLICE_API_EXPORTS $(python_cppflags) IcePy_ldflags := $(python_ldflags) -IcePy_dependencies := IceSSL Ice Slice IceUtil +IcePy_dependencies := IceSSL Ice +IcePy_libs := mcpp +IcePy_extra_sources := $(filter-out %Util.cpp %Ruby.cpp %DotNetNames.cpp,\ + $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/PythonUtil.cpp projects += $(project) -srcs:: $(project)
\ No newline at end of file +srcs:: $(project) |