1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

dtinfo subtree mmdb

This commit is contained in:
Ulrich Wilkens 2012-10-14 16:38:15 +02:00 committed by Jon Trulson
parent 8c8363f4a5
commit 8275485b4a
20 changed files with 54 additions and 23 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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"

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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