dtinfo subtree mmdb

diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
index 6a1dea25436b587fc2b096c24fbf5cd31d6900f8..70d03f1f3aa6deb7a58e2e889b4d68f8b609cfb7 100644 (file)
--- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
+++ b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
@@ -21,7 +21,8 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 XCOMM Do not put any -g here, will cause the generation of MasterTemplate.c.c
 XCOMM to use centerline_new, which cannot be linked on HP  
@@ -44,7 +45,7 @@ CXXEXTRA_DEFINES = -ptr../templates
 CXXEXTRA_DEFINES = -Xo
 #endif
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
 LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy)
 
 EXTRA_SRCS = TemplatesAutoNumber.C
@@ -70,6 +71,9 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)       
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
+#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES)
+SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES)
 #else
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-ptf -DEXPAND_TEMPLATES)

diff --git a/cde/programs/dtinfo/mmdb/Imakefile b/cde/programs/dtinfo/mmdb/Imakefile
index f3c8a9acf589008d0f7bae752ed72db2f224d9a1..d8c61af46a6636be1bef647eef9b0cbc60bedd61 100644 (file)
--- a/cde/programs/dtinfo/mmdb/Imakefile
+++ b/cde/programs/dtinfo/mmdb/Imakefile
@@ -43,6 +43,13 @@ DONES = \
 
 EXTRALIBRARYDEPS = $(DONES)
 
+XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
+#undef  TopLevelProject
+#define TopLevelProject                DtInfo
+IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
+               -DProjectTmplFile='<DtInfo.tmpl>' \
+               -DProjectRulesFile='<DtInfo.rules>'
+
 MakeSubdirs($(SUBDIRS))
 ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
@@ -229,6 +236,10 @@ OBJS =     $(API_OBJS)             $(BTREE_OBJS) \
 
 #include <Library.tmpl>
 
+XCOMM Variables to switch on debug mode temporarily
+XCOMM CDEBUGFLAGS = -g -DDEBUG
+XCOMM CXXDEBUGFLAGS = -g -DDEBUG
+
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 AllTarget(libMMDBTemplates.a)
 

diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
index dda4f8c2070d12375409b21fc2754f940e80ba96..c75f907995b2eb1b90055eec159e1917ebca09f5 100644 (file)
--- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
+++ b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
@@ -21,7 +21,8 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 #ifdef DtinfoClient
 DEFINES = -DCDE_NEXT 
@@ -92,7 +93,7 @@ NORMAL_SRCS = \
        VariableTable.C defParser.C             defToken.C \
        style.C         tokenStyle.C
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
 LinkSourceFile(SSTemplates.C,$(DTMMDBSRC)/StyleSheet)
 
 TEMPLATE_SRCS = SSTemplates.C
@@ -110,6 +111,9 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
+#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES)
+SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES)
 #else
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-ptf -DEXPAND_TEMPLATES)

diff --git a/cde/programs/dtinfo/mmdb/api/Imakefile b/cde/programs/dtinfo/mmdb/api/Imakefile
index e8ddee283ae88a8f6560618392a05d23eb951dd8..2ec38fcc51409f7a17e2644aa0daa1197469b795 100644 (file)
--- a/cde/programs/dtinfo/mmdb/api/Imakefile
+++ b/cde/programs/dtinfo/mmdb/api/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/api -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc

diff --git a/cde/programs/dtinfo/mmdb/btree/Imakefile b/cde/programs/dtinfo/mmdb/btree/Imakefile
index a5316910314027d3a2bc5efd21569f22d5d788db..c4181310bf7da4549c85f24381b32d5192d881cd 100644 (file)
--- a/cde/programs/dtinfo/mmdb/btree/Imakefile
+++ b/cde/programs/dtinfo/mmdb/btree/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/btree -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/compression/Imakefile b/cde/programs/dtinfo/mmdb/compression/Imakefile
index a23cedd5a7fcf53c7d554f59e5d1711863ccbe2b..9568241b2c3cd662c345feeab10253172e2f0f81 100644 (file)
--- a/cde/programs/dtinfo/mmdb/compression/Imakefile
+++ b/cde/programs/dtinfo/mmdb/compression/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/compression -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) 

diff --git a/cde/programs/dtinfo/mmdb/diskhash/Imakefile b/cde/programs/dtinfo/mmdb/diskhash/Imakefile
index 42efd2a37752b25c1f9b4fca65be54477023ec52..9466116dd0735a2b0af839e188e1fe071a49c62b 100644 (file)
--- a/cde/programs/dtinfo/mmdb/diskhash/Imakefile
+++ b/cde/programs/dtinfo/mmdb/diskhash/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/diskhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/dstr/Imakefile b/cde/programs/dtinfo/mmdb/dstr/Imakefile
index d3371fe6ae0e7ac52532d12311f88d492f2ddf91..4e4534520826fe53089a99921848191ba958564a 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dstr/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dstr/Imakefile
@@ -21,9 +21,13 @@ XCOMM                .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
-DEFINES  = 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
+#endif
+
+DEFINES  = $(EXCEPTION_DEFINES)
 INCLUDES = -I$(DTMMDBSRC)/dstr -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(set.C,$(DTMMDBSRC)/dstr)

diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile b/cde/programs/dtinfo/mmdb/dti_cc/Imakefile
index ed3754aef57be1f3f0404dc6b2a99c584d99d1a3..34ba9a96fef9a7db66f460f64d579d9f530ebb4e 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dti_cc/Imakefile
@@ -21,7 +21,8 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/dti_cc $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/dti_cc/main.C b/cde/programs/dtinfo/mmdb/dti_cc/main.C
index 46b55bf1e3d98d2ed62b5b41a381e3c70e6d4e58..013de2f19484d5944dc559fe9109759ecd40c344 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dti_cc/main.C
+++ b/cde/programs/dtinfo/mmdb/dti_cc/main.C
@@ -21,7 +21,8 @@
  * Floor, Boston, MA 02110-1301 USA
  */
 // $XConsortium: main.cc /main/3 1996/06/11 16:57:24 cde-hal $
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include "Exceptions.hh"
 #include "cc_exceptions.h"
 #include "CC_Slist.h"

diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
index e2004520c8cf984be2352bb0742f4e32ae58f3d9..bb5ce19b4ff0144ef93970b1db435d162db60828 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
@@ -21,10 +21,12 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
 EXCEPTION_DEFINES  = -DHAS_TERMINATE
+#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
 DEFINES  = -DCC_VERSION=30 -DCHECK_INITIALIZED $(EXCEPTION_DEFINES)

diff --git a/cde/programs/dtinfo/mmdb/dynhash/Imakefile b/cde/programs/dtinfo/mmdb/dynhash/Imakefile
index ff238d47978d6d3672b00d7e4866f8c1ebc3d9b7..5545802ee0fb94bfc50ae8ccb2ff5c035d8c0b9f 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dynhash/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dynhash/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = 
 INCLUDES = -I$(DTMMDBSRC)/dynhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/hmphf/Imakefile b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
index 83d8d6017daa093d34d26ad5a5ce57a7eb54aa5b..919ca2496dc1faf797de061156b6627d6997f494 100644 (file)
--- a/cde/programs/dtinfo/mmdb/hmphf/Imakefile
+++ b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
@@ -21,9 +21,13 @@ XCOMM                .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
-DEFINES  = -DPORTABLE_DB
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
+#endif
+
+DEFINES  = -DPORTABLE_DB $(EXCEPTION_DEFINES)
 INCLUDES = -I$(DTMMDBSRC)/hmphf -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(buckets.C,$(DTMMDBSRC)/hmphf)

diff --git a/cde/programs/dtinfo/mmdb/index/Imakefile b/cde/programs/dtinfo/mmdb/index/Imakefile
index 4346e1289571c38d59f44ec652f659ccae56f925..c2ac85b982180b3862b66f0cd03ffe78c1cc1c06 100644 (file)
--- a/cde/programs/dtinfo/mmdb/index/Imakefile
+++ b/cde/programs/dtinfo/mmdb/index/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
 INCLUDES = -I$(DTMMDBSRC)/index -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/mgrs/Imakefile b/cde/programs/dtinfo/mmdb/mgrs/Imakefile
index 4221be0fedf6eb92b328d6e83613cbe1c22a5a7d..14333329b7de19fe5ed9c377b49294b008153271 100644 (file)
--- a/cde/programs/dtinfo/mmdb/mgrs/Imakefile
+++ b/cde/programs/dtinfo/mmdb/mgrs/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DCOMPACTED_DISK_REP -DPORTABLE_DB
 INCLUDES = -I$(DTMMDBSRC)/mgrs -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/object/Imakefile b/cde/programs/dtinfo/mmdb/object/Imakefile
index 46948b82674fdb9968c33af2c760ebff7780160b..dca26752edf4488ad225f777e9e6337ecbcbb653 100644 (file)
--- a/cde/programs/dtinfo/mmdb/object/Imakefile
+++ b/cde/programs/dtinfo/mmdb/object/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
 INCLUDES = -I$(DTMMBDSRC)/object -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile b/cde/programs/dtinfo/mmdb/oliasdb/Imakefile
index 813cd74e5c6edfc53b68fe445dace8a604d6dee8..684aeb82506580a5cba882a63a53190c0fa6eaad 100644 (file)
--- a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile
+++ b/cde/programs/dtinfo/mmdb/oliasdb/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #ifdef DtinfoClient
 DEFINES= -DNO_DB_LOCK -DCDE_NEXT

diff --git a/cde/programs/dtinfo/mmdb/schema/Imakefile b/cde/programs/dtinfo/mmdb/schema/Imakefile
index f52402fb0db03a40d6c40784405c8ab48388eb85..1a5b1c04144e5875d7c0ff6eb75bd5fade053ef8 100644 (file)
--- a/cde/programs/dtinfo/mmdb/schema/Imakefile
+++ b/cde/programs/dtinfo/mmdb/schema/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
 INCLUDES = -I$(DTMMDBSRC)/schema -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc

diff --git a/cde/programs/dtinfo/mmdb/storage/Imakefile b/cde/programs/dtinfo/mmdb/storage/Imakefile
index 8b0472f411944d3a94a9c080f03f9f39770ccf47..9009d4e39d09598427afe742f6987eae242c5a3b 100644 (file)
--- a/cde/programs/dtinfo/mmdb/storage/Imakefile
+++ b/cde/programs/dtinfo/mmdb/storage/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
 INCLUDES = -I$(DTMMDBSRC)/storage -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)

diff --git a/cde/programs/dtinfo/mmdb/utility/Imakefile b/cde/programs/dtinfo/mmdb/utility/Imakefile
index 37c7f27e25760d5f12ad19eb812948a9e83c68b2..8ca138f0c76387acbabdfc32a317aa39e061d923 100644 (file)
--- a/cde/programs/dtinfo/mmdb/utility/Imakefile
+++ b/cde/programs/dtinfo/mmdb/utility/Imakefile
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
 INCLUDES = -I$(DTMMDBSRC)/utility -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc