Re-factored gmake build system

3 files changed, 16 insertions, 91 deletions

diff --git a/cpp/src/IceGridLib/.gitignore b/cpp/src/IceGridLib/.gitignore
deleted file mode 100644
index 9d7a58ce79a..00000000000
--- a/cpp/src/IceGridLib/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Admin.cpp
-Descriptor.cpp
-Exception.cpp
-FileParser.cpp
-Locator.cpp
-Observer.cpp
-PluginFacade.cpp
-Query.cpp
-Registry.cpp
-Session.cpp
-UserAccountMapper.cpp
-Admin.h
-Descriptor.h
-Exception.h
-FileParser.h
-Locator.h
-Observer.h
-PluginFacade.h
-Query.h
-Registry.h
-Session.h
-UserAccountMapper.h
diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile
deleted file mode 100644
index 1b0e78354f9..00000000000
--- a/cpp/src/IceGridLib/Makefile
+++ /dev/null
@@ -1,64 +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,IceGrid,$(VERSION))
-SONAME          = $(call mksoname,IceGrid,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceGrid)
-
-LIBTARGETS	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-TARGETS         = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
-
-SLICE_OBJS	= Admin.o \
-		  Descriptor.o \
-		  Exception.o \
-		  FileParser.o \
-		  PluginFacade.o \
-		  Registry.o \
-		  Session.o \
-		  UserAccountMapper.o
-
-OBJS		= PluginFacadeI.o \
-		  $(SLICE_OBJS)
-
-
-HDIR		= $(headerdir)/IceGrid
-SDIR		= $(slicedir)/IceGrid
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS)
-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 $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(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))
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
new file mode 100644
index 00000000000..26f2111a5fb
--- /dev/null
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -0,0 +1,16 @@
+# **********************************************************************
+#
+# 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	:= IceGrid
+
+IceGrid_targetdir	:= $(libdir)
+IceGrid_dependencies	:= Glacier2 Ice IceUtil
+IceGrid_sliceflags	:= --include-dir IceGrid --dll-export ICE_GRID_API
+
+projects += $(project)