diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
| commit | b55ce15878456e3d2f0656bcd6abd5a55c6774b1 (patch) | |
| tree | e7e771a3d90ae7295f20bf0622b72c72cc3a85e0 /cpp/src/IceGridLib | |
| parent | Fixed ObjC build (diff) | |
| download | ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.bz2 ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.xz ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.zip | |
Changes for brew, python PyPI packaging and ruby gem packaging.
Diffstat (limited to 'cpp/src/IceGridLib')
| -rw-r--r-- | cpp/src/IceGridLib/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile index 8fce12114df..05410c99580 100644 --- a/cpp/src/IceGridLib/Makefile +++ b/cpp/src/IceGridLib/Makefile @@ -42,6 +42,12 @@ ICECPPFLAGS := $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS) LINKWITH := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil +ifeq ($(STATICLIBS),yes) +$(libdir)/$(LIBNAME): $(OBJS) + @mkdir -p $(dir $@) + rm -f $@ + $(call mklib,$@,$(OBJS)) +else $(libdir)/$(LIBFILENAME): $(OBJS) @mkdir -p $(dir $@) rm -f $@ @@ -55,6 +61,7 @@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) @mkdir -p $(libdir)$(cpp11libdirsuffix) rm -f $@ ln -s $(cpp11sonamedir)$(SONAME) $@ +endif install:: all $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) |