debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduction of BSDArchitecture

Browse Source
This commit is contained in:
Ulrich Wilkens
2013-10-19 23:55:59 +02:00
committed by Jon Trulson
parent 380867c31c
commit 6b0da8f335
48 changed files with 66 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View File

@@ -26,8 +26,7 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
View File

@@ -27,8 +27,7 @@ SpecialCPlusPlusObjectRule(NodeDisplayDataTml.o NodeViewInfo.o,,$(LICENSE_L_INCL
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
View File

@@ -24,8 +24,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

8
cde/programs/dtinfo/dtinfo/src/Imakefile
View File

@@ -42,9 +42,9 @@ SYS_LIBRARIES=-lm -liconv /usr/lib/libpthreads.a -blibpath:/usr/dt/lib:/X11/lib:
SYS_LIBRARIES=-lm -lfs
#elif defined(HPArchitecture)
SYS_LIBRARIES=$(DYNAMIC) -lm
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
#elif defined(LinuxArchitecture)
SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib
#elif defined(OpenBSDArchitecture)
#elif defined(BSDArchitecture)
SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
#else
SYS_LIBRARIES=-lm
@@ -313,7 +313,7 @@ all:: Prelude.h dfiles messages Dtinfo
includes:: Prelude.h dfiles messages
#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(BSDArchitecture)
# ifndef Dont_Use_Templates_Repository
# define Dont_Use_Templates_Repository
UAS_INCLUDES=-I./UAS/Base
@@ -338,7 +338,7 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
#elif defined(DoLicenseManagement)
SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
#else

3
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
View File

@@ -46,8 +46,7 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
View File

@@ -21,8 +21,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
View File

@@ -17,8 +17,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

5
cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
View File

@@ -33,7 +33,7 @@ dfiles:
#ifdef UXPArchitecture
SpecialCPlusPlusObjectRule(ORTemplates.o,, +Tall_tmpls -DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,+Tall_tmpls -DEXPAND_TEMPLATES)
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SpecialCPlusPlusObjectRule(ORTemplates.o,,-DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,-DEXPAND_TEMPLATES)
#endif
@@ -51,8 +51,7 @@ RealLibrary($(LIBNAME),$(OBJS),$(LIBDIR))
#else
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Other/Imakefile
View File

@@ -21,8 +21,7 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
View File

@@ -18,8 +18,7 @@ OBJS=$(SRCS:.C=.o)
make_libfiles($(LIBNAME), $(CLASSES))
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Query/Imakefile
View File

@@ -38,8 +38,7 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/Support/Imakefile
View File

@@ -21,8 +21,7 @@ make_libfiles($(LIBNAME), $(CLASSES))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
NotSoSimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
NotSoSimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))
#else
NotSoSimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR), $(OTHEROBJS))

3
cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
View File

@@ -22,8 +22,7 @@ OBJS=$(SRCS:.C=.o)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
View File

@@ -25,8 +25,7 @@ make_msgs($(LIBNAME), $(MSGS))
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
View File

@@ -29,8 +29,7 @@ OBJS=$(SRCS:.C=.o)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
#elif defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

3
cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
View File

@@ -36,8 +36,7 @@ PREF_LIB_OBJS = $(PREF_LIB_SRCS:.C=.o)
make_libfiles($(LIBNAME),)
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(PREF_LIB_NAME), $(PREF_LIB_OBJS), $(LIBDIR))
SimpleLibraryT(uasdrv, uasdrv.o,)
#else

3
cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
View File

@@ -28,8 +28,7 @@ NormalLibraryObjectRule()
INCLUDES=$(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture) || \
defined(LinuxArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#else
SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

2
cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
View File

@@ -290,7 +290,7 @@ SimpleCPlusPlusProgram(NodeParser, NodeParser.o libOLAFParse.a libOLAFParseT.a,$
SimpleCPlusPlusProgram(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
TEMPLATE_OBJS = TKTemplate.o
RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))

2
cde/programs/dtinfo/dtinfogen/install/Imakefile
View File

@@ -206,7 +206,7 @@ ALL_MMDB_OBJS = $(API_OBJS) $(BTREE_OBJS) \
#ifdef AIXArchitecture
Libs=$(ALL_MMDB_OBJS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
Libs=$(MMDB_LIBS) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(MATH_LIB)
#else
Libs=$(MMDB_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)

6
cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
View File

@@ -181,13 +181,13 @@ ALL_MMDB_OBJS = $(API_OBJS) $(BTREE_OBJS) \
#ifdef AIXArchitecture
Libs = $(ALL_MMDB_OBJS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
Libs=$(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB)
#else
Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB) $(MATH_LIB)
#else
Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
@@ -196,7 +196,7 @@ Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs))
SimpleCPlusPlusProgram(restore,restore.o,$(Libs))
#if defined(USLArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(USLArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture)
SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
#else
SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))

4
cde/programs/dtinfo/mmdb/HardCopy/Imakefile
View File

@@ -45,7 +45,7 @@ CXXEXTRA_DEFINES = -ptr../templates
CXXEXTRA_DEFINES = -Xo
#endif
#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy)
EXTRA_SRCS = TemplatesAutoNumber.C
@@ -71,7 +71,7 @@ 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) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES)
#else

4
cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
View File

@@ -93,7 +93,7 @@ NORMAL_SRCS = \
VariableTable.C defParser.C defToken.C \
style.C tokenStyle.C
#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
LinkSourceFile(SSTemplates.C,$(DTMMDBSRC)/StyleSheet)
TEMPLATE_SRCS = SSTemplates.C
@@ -111,7 +111,7 @@ 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) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES)
#else

2
cde/programs/dtinfo/mmdb/dstr/Imakefile
View File

@@ -23,7 +23,7 @@ XCOMM .../programs/dtinfo/mmdb/<subdir>/Imakefile
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS
#endif

2
cde/programs/dtinfo/mmdb/dti_excs/Imakefile
View File

@@ -25,7 +25,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
EXCEPTION_DEFINES = -DHAS_TERMINATE
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS
#endif

2
cde/programs/dtinfo/mmdb/hmphf/Imakefile
View File

@@ -23,7 +23,7 @@ XCOMM .../programs/dtinfo/mmdb/<subdir>/Imakefile
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS
#endif