summaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'ruby')
-rw-r--r--ruby/Makefile2
-rw-r--r--ruby/src/IceRuby/Makefile.mk12
2 files changed, 10 insertions, 4 deletions
diff --git a/ruby/Makefile b/ruby/Makefile
index c993e6009ec..9d9f9b10657 100644
--- a/ruby/Makefile
+++ b/ruby/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)))
$(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2rb))
#
diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk
index 47b10468eae..6ccbe914fc6 100644
--- a/ruby/src/IceRuby/Makefile.mk
+++ b/ruby/src/IceRuby/Makefile.mk
@@ -13,9 +13,15 @@ IceRuby_target := ruby-module
IceRuby_targetname := IceRuby
IceRuby_targetdir := $(lang_srcdir)/ruby
IceRuby_installdir := $(install_rubylibdir)
-IceRuby_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated $(ruby_cppflags)
+IceRuby_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \
+ -I$(top_srcdir)/cpp/src -DSLICE_API_EXPORTS $(ruby_cppflags)
IceRuby_ldflags := $(ruby_ldflags)
-IceRuby_dependencies := IceSSL Ice Slice IceUtil
+IceRuby_dependencies := IceSSL Ice
+IceRuby_libs := mcpp
+IceRuby_extra_sources := $(filter-out %Util.cpp %Python.cpp %DotNetNames.cpp,\
+ $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
+ $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
+ $(top_srcdir)/cpp/src/Slice/RubyUtil.cpp
projects += $(project)
-srcs:: $(project) \ No newline at end of file
+srcs:: $(project)