diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-19 11:14:32 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-19 11:14:32 -0400 |
| commit | 328a63dd705e828b99e1961b4f2d9e188ddb27ff (patch) | |
| tree | 2c255df04e6ffb2fcb950b1b05907f820b71984c /cpp/src | |
| parent | Fix Silverlight PolicyServer AssemblyInfo (diff) | |
| download | ice-328a63dd705e828b99e1961b4f2d9e188ddb27ff.tar.bz2 ice-328a63dd705e828b99e1961b4f2d9e188ddb27ff.tar.xz ice-328a63dd705e828b99e1961b4f2d9e188ddb27ff.zip | |
Fixed ICE-4802: deprecated Qt/SQL database plugins for IceGrid and IceStorm
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 6 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 3 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 2 |
4 files changed, 2 insertions, 11 deletions
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 \
|