summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-11-19 13:16:16 -0800
committerMark Spruiell <mes@zeroc.com>2012-11-19 13:16:16 -0800
commit552f127e19c9db2c757468be9a667665290d0efb (patch)
tree827046aa753a671f18fd72e56291446d285a9dcf
parentRegenerate .gitignore files (diff)
downloadice-552f127e19c9db2c757468be9a667665290d0efb.tar.bz2
ice-552f127e19c9db2c757468be9a667665290d0efb.tar.xz
ice-552f127e19c9db2c757468be9a667665290d0efb.zip
Ruby build fixes
-rw-r--r--rb/config/Make.rules3
-rw-r--r--rb/src/IceRuby/Makefile2
2 files changed, 0 insertions, 5 deletions
diff --git a/rb/config/Make.rules b/rb/config/Make.rules
index 1691249b29e..fdb5a2ec070 100644
--- a/rb/config/Make.rules
+++ b/rb/config/Make.rules
@@ -114,9 +114,6 @@ RUBY_LIBS = -L$(RUBY_LIB_DIR) $(RUBY_LIB)
#
ice_language = rb
ice_require_cpp = yes
-
-include $(top_srcdir)/../cpp/config/Make.rules.common
-
slice_translator = slice2rb
ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0)
diff --git a/rb/src/IceRuby/Makefile b/rb/src/IceRuby/Makefile
index 99f879cfaa3..a033dcea2f1 100644
--- a/rb/src/IceRuby/Makefile
+++ b/rb/src/IceRuby/Makefile
@@ -9,8 +9,6 @@
top_srcdir = ../..
-include $(top_srcdir)/../cpp/config/Make.rules.common
-
LIBFILENAME = $(call mkrblibfilename,IceRuby,$(VERSION))
SONAME = $(call mkrbsoname,IceRuby,$(SOVERSION))
LIBNAME = $(call mkrblibname,IceRuby)