diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
| commit | ee3b7be185f7d887a33b9c242a7ccd08a09d2614 (patch) | |
| tree | 1974211a0cbd5e3df95b6deed0b2b42f7854aca9 /ruby/src | |
| parent | Rename files for consistency (diff) | |
| download | ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.bz2 ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.xz ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.zip | |
Re-factored gmake build system
Diffstat (limited to 'ruby/src')
| -rw-r--r-- | ruby/src/IceRuby/Makefile | 50 | ||||
| -rw-r--r-- | ruby/src/IceRuby/Makefile.mk | 21 | ||||
| -rw-r--r-- | ruby/src/Makefile | 24 |
3 files changed, 21 insertions, 74 deletions
diff --git a/ruby/src/IceRuby/Makefile b/ruby/src/IceRuby/Makefile deleted file mode 100644 index ccbdc362991..00000000000 --- a/ruby/src/IceRuby/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# ********************************************************************** -# -# 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. -# -# ********************************************************************** - -top_srcdir = ../.. - -LIBFILENAME = $(call mkrblibfilename,IceRuby,$(VERSION)) -SONAME = $(call mkrbsoname,IceRuby,$(SOVERSION)) -LIBNAME = $(call mkrblibname,IceRuby) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) - -OBJS = Communicator.o \ - Connection.o \ - Endpoint.o \ - ImplicitContext.o \ - Init.o \ - Logger.o \ - Operation.o \ - Properties.o \ - Proxy.o \ - Slice.o \ - Types.o \ - Util.o \ - ValueFactoryManager.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) $(ICE_FLAGS) $(RUBY_FLAGS) -LINKWITH := -L"$(libdir)" $(ICE_LIBS) $(RUBY_LIBS) $(CXXLIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)/$(LIBNAME): $(libdir)/$(SONAME) - rm -f $@ - ln -s $(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk new file mode 100644 index 00000000000..47b10468eae --- /dev/null +++ b/ruby/src/IceRuby/Makefile.mk @@ -0,0 +1,21 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceRuby + +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_ldflags := $(ruby_ldflags) +IceRuby_dependencies := IceSSL Ice Slice IceUtil + +projects += $(project) +srcs:: $(project)
\ No newline at end of file diff --git a/ruby/src/Makefile b/ruby/src/Makefile deleted file mode 100644 index 76a7f755971..00000000000 --- a/ruby/src/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# 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. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = IceRuby - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - if test -d $$subdir ; \ - then \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - fi; \ - done |