external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cde/config/cf/Imake.cf
View file

@ -37,7 +37,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define MacroIncludeFile <bsd.cf>
# define MacroFile bsd.cf
# undef vax
# define BSDArchitecture
# define VaxArchitecture
#endif /* vax */
@ -54,6 +53,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
#ifdef __OpenBSD__
# undef __OpenBSD__
# undef __NetBSD__
# define BSDArchitecture
# define OpenBSDArchitecture
# define KOpenBSDArchitecture
# define MacroIncludeFile <OpenBSD.cf>
@ -171,6 +171,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define MacroIncludeFile <NetBSD.cf>
# define MacroFile NetBSD.cf
# undef __NetBSD__
# define BSDArchitecture
# define NetBSDArchitecture
# ifdef __i386__
# define i386BsdArchitecture
@ -187,6 +188,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define MacroIncludeFile <FreeBSD.cf>
# define MacroFile FreeBSD.cf
# undef __FreeBSD__
# define BSDArchitecture
# define FreeBSDArchitecture
# ifdef __i386__
# define i386BsdArchitecture

2
cde/config/cf/Motif.tmpl
View file

@ -590,7 +590,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
/* check for existence of Dtinfo Motif Documents */
#if defined(LinuxArchitecture)
MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi)
#elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#elif defined(BSDArchitecture)
MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi
#else
MOTIF_DOC = -D_MOTIFDOC_

6
cde/config/cf/site.def
View file

@ -79,7 +79,9 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
#endif
#ifndef MotifProjectRoot
# if defined(OpenBSDArchitecture)
# if defined(FreeBSDArchitecture)
# define MotifProjectRoot /usr/local
# elif defined(OpenBSDArchitecture)
# define MotifProjectRoot /usr/local
# endif
#endif
@ -101,7 +103,7 @@ XCOMM build the DtXinerama support
XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
XCOMM or building non-C locales will cause build failures.
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
# define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
#endif

2
cde/doc/de_DE.ISO8859-1/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:19:59 drk $
#define IHaveSubdirs
#define PassCDebugFlags
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
#else

2
cde/doc/es_ES.ISO8859-1/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:32:32 drk $
#define IHaveSubdirs
#define PassCDebugFlags
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
#else

2
cde/doc/fr_FR.ISO8859-1/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:43:05 drk $
#define IHaveSubdirs
#define PassCDebugFlags
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
#else

2
cde/doc/it_IT.ISO8859-1/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/3 1996/06/19 16:53:57 drk $
#define IHaveSubdirs
#define PassCDebugFlags
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
#else

2
cde/doc/ja_JP.dt-eucJP/Imakefile
View file

@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
#define PassCDebugFlags
/* due to split-VOB setup, force help to come last in make Makefiles */
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
BSUBDIRS = help

8
cde/lib/DtHelp/Imakefile
View file

@ -13,7 +13,7 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
#define IHaveSubdirs
#define PassCDebugFlags /**/
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
SUBDIRS = il
DONES = il/DONE
#else
@ -34,9 +34,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
#endif
INCLUDES = -I. -I./il -I./jpeg
#if defined(OpenBSDArchitecture)
INCLUDES += -I$(INCROOT)
#endif
DEFINES = -DDTLIB $(LOCAL_DEFINES) \
-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@ -155,7 +153,7 @@ JPEG_OBJS = \
jpeg/jdinput.o jpeg/jerror.o jpeg/jutils.o
SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
#else
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)

2
cde/lib/DtSearch/Imakefile
View file

@ -13,7 +13,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE
EXTRA_DEFINES = -DBYTE_SWAP
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP
#endif

2
cde/lib/DtSearch/raima/Imakefile
View file

@ -23,7 +23,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE
EXTRA_DEFINES = -D_XOPEN_SOURCE
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
#endif

6
cde/lib/DtTerm/TermPrim/Imakefile
View file

@ -109,11 +109,7 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
#endif
#ifdef FreeBSDArchitecture
LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
#endif
#ifdef OpenBSDArchitecture
#ifdef BSDArchitecture
LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
#endif

4
cde/programs/Imakefile
View file

@ -11,9 +11,7 @@ XCOMM some of these cannot be built on linux yet.
XCOMM dtinfo
#if defined(LinuxArchitecture)
DTINFODIR = dtinfo
#elif defined(OpenBSDArchitecture)
DTINFODIR = dtinfo
#elif defined(FreeBSDArchitecture)
#elif defined(BSDArchitecture)
DTINFODIR = dtinfo
#else
DTINFODIR = dtinfo

4
cde/programs/dtcm/dtcm/Imakefile
View file

@ -16,7 +16,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
$(ICONV_INBUF_DEFINE)
#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture)
TTY_LIBRARIES = $(LOCAL_LIBRARIES)
#elif defined(AlphaArchitecture)
TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
@ -32,7 +32,7 @@ EXTRA_LIBRARIES = -lrpcsvc -lPW -ldiag
EXTRA_LIBRARIES = -lrpcsvc -lV3
#endif
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(BSDArchitecture)
EXTRA_LIBRARIES = -lcompat
#endif

2
cde/programs/dtfile/Imakefile
View file

@ -36,7 +36,7 @@ EXTRA_CCOPTIONS = -xF
EXTRA_INCLUDES = -I/usr/include/freetype2
#endif
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(BSDArchitecture)
EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
#endif

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

4
cde/programs/dtlogin/Imakefile
View file

@ -139,7 +139,7 @@ DEPXDMCPLIB =
INCLUDES = -I/usr/include/freetype2
#endif
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(BSDArchitecture)
INCLUDES = -I$(XPROJECTROOT)/include/freetype2
#endif
@ -203,6 +203,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
#if defined (SunArchitecture)
NATIVEXBINDIR = /usr/openwin/bin
#elif defined(FreeBSDArchitecture)
NATIVEXBINDIR = /usr/local/bin
#elif defined(OpenBSDArchitecture)
NATIVEXBINDIR = /usr/X11R6/bin
#else

2
cde/programs/dtpdmd/Imakefile
View file

@ -36,7 +36,7 @@ OBJS = dispatch.o dtpdmd.o mailbox.o \
manager.o records.o setup.o \
util.o nlmsg.o
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
/* On Linux, just use the system provided Xau */
DEPXAUTHLIB =
#endif

3
cde/programs/dtspcd/Imakefile
View file

@ -24,8 +24,7 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
SYS_LIBRARIES = -lm -lgen
#endif
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) \
|| defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
$(XMLIB) $(XTOOLLIB) $(XLIB)
SYS_LIBRARIES = -lm

2
cde/programs/localized/templates/French.tmpl
View file

@ -31,6 +31,6 @@ LANG=fr
LANG=fr
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
LANG=fr_FR.ISO8859-1
#endif

2
cde/programs/localized/templates/German.tmpl
View file

@ -31,6 +31,6 @@ LANG=de
LANG=de
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
LANG=de_DE.ISO8859-1
#endif

2
cde/programs/localized/templates/Italian.tmpl
View file

@ -31,6 +31,6 @@ LANG=it
LANG=it
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
LANG=it_IT.ISO8859-1
#endif

2
cde/programs/localized/templates/Spanish.tmpl
View file

@ -31,6 +31,6 @@ LANG=es
LANG=es
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
LANG=es_ES.ISO8859-1
#endif

2
cde/programs/nsgmls/Imakefile
View file

@ -77,7 +77,7 @@ STLIBCENV =
M4 = /bin/m4
#endif
#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
/*
* put cpp directives here rather than in CXXDEFINES because