Introduction of BSDArchitecture

diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 9e93abf539caf35a513a3ba7e024e9b5e19ef22f..0631897d7f964d7affc857c0889f95169d00a72e 100644 (file)
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -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

diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 8deebe9b4f384995f64d8f4814109c9b6e3093b3..66d41d2b2224a78b31644872d8018a1f142347bd 100644 (file)
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -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_

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 54a337953c871cfc3c9683f77437a4405badd4aa..ec3b955d614f3d86987e823993bfcc4e540dc435 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -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
 

diff --git a/cde/doc/de_DE.ISO8859-1/Imakefile b/cde/doc/de_DE.ISO8859-1/Imakefile
index e8090a8d4acbbf836d26c5538f3b956a2419be87..1697c8c9eba09363b488e0f918e8182cbc1833ca 100644 (file)
--- a/cde/doc/de_DE.ISO8859-1/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/Imakefile
@@ -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

diff --git a/cde/doc/es_ES.ISO8859-1/Imakefile b/cde/doc/es_ES.ISO8859-1/Imakefile
index 994d034a3f0395e8c0edd27471e193532ec39d22..0fb60263a9fea3d02dd850af4f122052ad0b7de3 100644 (file)
--- a/cde/doc/es_ES.ISO8859-1/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/Imakefile
@@ -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

diff --git a/cde/doc/fr_FR.ISO8859-1/Imakefile b/cde/doc/fr_FR.ISO8859-1/Imakefile
index b6dfe70367af53df5891a7b2c7c9c48c5a22467c..2523bb57ec51c0d4c4a47a499411bd135b9e237e 100644 (file)
--- a/cde/doc/fr_FR.ISO8859-1/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/Imakefile
@@ -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

diff --git a/cde/doc/it_IT.ISO8859-1/Imakefile b/cde/doc/it_IT.ISO8859-1/Imakefile
index c62ff2e0dee313ce953b0cab34e8f03ff7ab28c2..87323a25d4aa2bdc870bc4246ab9ef21477d4df7 100644 (file)
--- a/cde/doc/it_IT.ISO8859-1/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/Imakefile
@@ -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

diff --git a/cde/doc/ja_JP.dt-eucJP/Imakefile b/cde/doc/ja_JP.dt-eucJP/Imakefile
index b45fe15b31cb64afb44d21aded2d319277f11ab7..f40c06ec4f732dbbcd9fbeeab91179dee0b2b4c7 100644 (file)
--- a/cde/doc/ja_JP.dt-eucJP/Imakefile
+++ b/cde/doc/ja_JP.dt-eucJP/Imakefile
@@ -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 

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index a33c70468b1ad9d0c9a5486130acb1151b7d9bca..8dbda1fd941fc93d85bc9e1855c577f8afb5432e 100644 (file)
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -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)

diff --git a/cde/lib/DtSearch/Imakefile b/cde/lib/DtSearch/Imakefile
index 91b66cce800670dea1f0186379ad1b631430f9bd..5ba42b9d8a52dea27af608e496ea4313a431f30d 100644 (file)
--- a/cde/lib/DtSearch/Imakefile
+++ b/cde/lib/DtSearch/Imakefile
@@ -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
 

diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile
index f501ee8bae866036165349e6eed2760dac6a04c8..a47c15b9c42bcf573b2161cce1c6b43ec634b067 100644 (file)
--- a/cde/lib/DtSearch/raima/Imakefile
+++ b/cde/lib/DtSearch/raima/Imakefile
@@ -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
 

diff --git a/cde/lib/DtTerm/TermPrim/Imakefile b/cde/lib/DtTerm/TermPrim/Imakefile
index a0a3b0edaeeb6cb6fc9f4ae0b85631dad7fd875f..04277ae2a6ffcc224e811c6a93f81ad2865054c8 100644 (file)
--- a/cde/lib/DtTerm/TermPrim/Imakefile
+++ b/cde/lib/DtTerm/TermPrim/Imakefile
@@ -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
 

diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index ef1abd63556253cfa8294163336f387e51612fe6..84495b8045159c500616fea478a104c6f436c91e 100644 (file)
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -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

diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index 9d508a53a9bb01ad270555198e1cd05b66707059..e889c16a40fb544fcbb83a4dcd6f77227ba3ba1b 100644 (file)
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -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
 

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 279389c2fe84bbf9fefd082590c500c1e2442d8a..abe6a40b80553b8e8946ebb6aa15f3c17d4da860 100644 (file)
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -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
 

diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile b/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
index 5ea3c320d60f3e308921b3d794371780e3550929..51ec0c195e31d952281f0eb1c17471844e71a0ca 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile b/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
index 884a9d29a5334d38d4ced83133aab8eb70c31bb2..c86cbe9ffa3f6e6b1c46798f4876ca9ff2a9d0f9 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile b/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
index 4abbd863945bfea09d8e136053d9538b76300646..5fc3fbfb07f97e42fb9e7d983bedb6a4f8e998dc 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Imakefile b/cde/programs/dtinfo/dtinfo/src/Imakefile
index b9dc50397537bc342a2091881d9366af58950921..e5330200e0c2b5caa737fb56e3cd218f8bb9b2ec 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Imakefile
@@ -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

diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile b/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
index 56e05641b32ef94e5ebe03f8fe18468b309cd914..38650b6a3880ef030f7991649f5553d18cd27dbf 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile b/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
index 50eab7ce0806e041eb68054fac9099d209d4d382..a9b6a6e6ddb8aca070754e7b7939d542acd0198c 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
index 335e9f2c58c1b4512c8d0637113fce4eaeb33a71..929e65a269332e57a56d1a14f9b0f91ebf29cf81 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
index 2e9e0ccab0897d77d38222b80ad6724d8a8af8cd..467fcb49e03fb5faae1aa9b0a8ce842ac61062ef 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Imakefile b/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
index 499ef5b53bdbc5557befe3dc82c47758fbc093b0..3d536330cea45798721440dc76b5efdb3a3432f4 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Other/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile b/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
index f0c56e47ac636c8afb6160e46e9d8a2e15a90630..ee54e404092b4b7ea0a2060fe5f4891b447bdff9 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Imakefile b/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
index beb330bf7a65cca12db02898d6b37621e6fd90ae..6699adf7bf8f95e00dbbe976316d2635f10466c8 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Query/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Imakefile b/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
index 786629dfb627048e8f040684648ae25e04b55cfd..b0f5fce90dc62348f53aad1561c7cd1b0da2835a 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Support/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
index c87de53122a6f6865dae34849812b31e3d51f69f..f66be8d5b4402c2af9919df673d5ea1daa390c04 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
index 09c2939dd497db5ee92aa3870106ca89a88b4823..7f9c548e7ae5b0d48532c6fa3b99c2793b377fa4 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
index 3666e23e3eba59134bee4a6d9e9544467d4fdac0..9df31c4e37941c9adb7545825ff231901454aaa6 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile b/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
index 2d968a0ad66172f29a84b62c8fc6cedf2b274bf4..4d22426546f314ea8eae38c8ad7a8551230b779a 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Test/Imakefile
@@ -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

diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile b/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
index 1894211b6f7c8f8df0f98bc9f10fb72326f18c9e..593c3b1cc740b9285ab70da59f9fe0ffc2b6cddf 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile b/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
index 29ec75fbaa1cea1ebfd36d7696a7d72786d0262d..cfb5edc926824ee7dabe5b2994ce8e48a7f29652 100644 (file)
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/dtinfogen/install/Imakefile b/cde/programs/dtinfo/dtinfogen/install/Imakefile
index b89a575c498023d3f4825086ddf61be717181bb5..0dcb327f333760408083fd2da9a51d7f6499ec01 100644 (file)
--- a/cde/programs/dtinfo/dtinfogen/install/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/install/Imakefile
@@ -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)

diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
index e9120fcb48ba8704368f3ceb820388bda841d32d..6d29de4ebd0866585a6b6046f3640b36872490e2 100644 (file)
--- a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
+++ b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
@@ -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))

diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
index 689526f91819193a9dba77e892bc3602e0a0b38b..372872b734316408437911ae04d67691d0d24946 100644 (file)
--- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
+++ b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
@@ -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

diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
index 9093310ebb9a79de44df683ba55f0367986fb652..facee7e716ae3bcf9a4d1d24dd092797d12fd4a4 100644 (file)
--- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
+++ b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
@@ -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

diff --git a/cde/programs/dtinfo/mmdb/dstr/Imakefile b/cde/programs/dtinfo/mmdb/dstr/Imakefile
index 2335ba99ca0aeafdec20ff0ff7569b8c403a002c..c3d192060dceaf2af95febe305272130848b28ae 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dstr/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dstr/Imakefile
@@ -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
 

diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
index f2348d05240af399f55379f67e93b51e89867f27..d4854da8e415a5d87710829caee5ce48b5bdeff9 100644 (file)
--- a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
+++ b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
@@ -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
 

diff --git a/cde/programs/dtinfo/mmdb/hmphf/Imakefile b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
index b3bc5fa34393fc5b0395ec30f08b06150ba0c7fc..daf3118f7594ae39af48336c00bf56fc9696a814 100644 (file)
--- a/cde/programs/dtinfo/mmdb/hmphf/Imakefile
+++ b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
@@ -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
 

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 227a746218289c10f60c3653ba1806e3abb3eab4..82b44df558f76cf2162a4507894905b25e418ee2 100644 (file)
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -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

diff --git a/cde/programs/dtpdmd/Imakefile b/cde/programs/dtpdmd/Imakefile
index 1eaa2e1ad15dbee71e54f00e9a155db9a6907cb7..84344d5bde4b71e53cdb394dd703b35d73db0884 100644 (file)
--- a/cde/programs/dtpdmd/Imakefile
+++ b/cde/programs/dtpdmd/Imakefile
@@ -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

diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 3e7a43384f174ba0d49cc4b63541580dab61f924..7842f1c737634749f8e334c413fe8eee67b580cb 100644 (file)
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -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

diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl
index 0bc6c96865f02265f42aed4f84bd4162bbd9aae8..bcfa1b514a392ac3eda9e98893228c112c3ee9b3 100644 (file)
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -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

diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl
index 53be70f2c6f924baa7397af3e607304aa1e6b630..31eb54e30f4582e28c4494b97589c2cfc480c8a8 100644 (file)
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -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

diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl
index 4e8f24333471d1ed183c14e39c60ec0ef70d365b..d8bdad2dbac75b13f44ee3e3f033c55c1d67c1d2 100644 (file)
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -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

diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl
index 69d1fb3b1a39a1fe9b1b93f347304f4c49b1bf47..5cdd954596f2b173b41689f5be0f0d4d26bfb14b 100644 (file)
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -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

diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 6e07d98be4e824ce628a0cd0924e0306a0f2ea33..ac90c078092cedee4362e3f51935cd9c4f3dd4ba 100644 (file)
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -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