From 328a63dd705e828b99e1961b4f2d9e188ddb27ff Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 19 Oct 2012 11:14:32 -0400 Subject: Fixed ICE-4802: deprecated Qt/SQL database plugins for IceGrid and IceStorm --- cpp/src/IceGrid/Makefile | 6 ------ cpp/src/IceGrid/Makefile.mak | 2 +- cpp/src/IceStorm/Makefile | 3 --- cpp/src/IceStorm/Makefile.mak | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 6fbab02e7f7..b4593c58dfd 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -118,9 +118,6 @@ install:: all $(call installprogram,$(REGISTRY_SERVER),$(install_bindir)) SUBDIRS = FreezeDB -ifneq ($(QT_HOME),) - SUBDIRS += SqlDB -endif $(EVERYTHING):: @for subdir in $(SUBDIRS); \ @@ -132,7 +129,4 @@ $(EVERYTHING):: fi; \ done -# Needed for make -jn to work. -#../IceGrid/Grammar.y: Grammar.h - include .depend diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index f9e582fa235..2dfa2e32adb 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -162,7 +162,7 @@ install:: all !endif -SUBDIRS = FreezeDB SqlDB +SUBDIRS = FreezeDB $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 87b811f61de..af2b258aae2 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -88,9 +88,6 @@ install:: all $(call installprogram,$(ADMIN),$(install_bindir)) SUBDIRS = FreezeDB -ifneq ($(QT_HOME),) - SUBDIRS += SqlDB -endif $(EVERYTHING):: @for subdir in $(SUBDIRS); \ diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 0390adbde8f..b571d90af62 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -119,7 +119,7 @@ install:: all !endif -SUBDIRS = FreezeDB SqlDB +SUBDIRS = FreezeDB $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ -- cgit v1.2.3