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 /cpp/src/IcePatch2Lib | |
| 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 'cpp/src/IcePatch2Lib')
| -rw-r--r-- | cpp/src/IcePatch2Lib/.gitignore | 9 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/Makefile | 48 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/Makefile.mk | 18 |
3 files changed, 18 insertions, 57 deletions
diff --git a/cpp/src/IcePatch2Lib/.gitignore b/cpp/src/IcePatch2Lib/.gitignore deleted file mode 100644 index a6ba57e6121..00000000000 --- a/cpp/src/IcePatch2Lib/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -FileInfo.cpp -FileServer.cpp -FileInfo.h -FileServer.h diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile deleted file mode 100644 index e8b6d4e5565..00000000000 --- a/cpp/src/IcePatch2Lib/Makefile +++ /dev/null @@ -1,48 +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 mklibfilename,IcePatch2,$(VERSION)) -SONAME = $(call mksoname,IcePatch2,$(SOVERSION)) -LIBNAME = $(call mklibname,IcePatch2) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = FileInfo.o \ - FileServer.o - -OBJS = ClientUtil.o \ - Util.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/IcePatch2 -SDIR = $(slicedir)/IcePatch2 - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) $(BZIP2_FLAGS) -Wno-deprecated-declarations -SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(BZIP2_LIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk new file mode 100644 index 00000000000..e63a56ab3c8 --- /dev/null +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 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 := IcePatch2 + +IcePatch2_targetdir := $(libdir) +IcePatch2_dependencies := Ice IceUtil +IcePatch2_libs := bz2 +IcePatch2_sliceflags := --include-dir IcePatch2 --dll-export ICE_PATCH2_API +IcePatch2_cppflags := -Wno-deprecated-declarations + +projects += $(project) |