1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

Introduction of BSDArchitecture

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

View file

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

View file

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

View file

@ -79,7 +79,9 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
#endif #endif
#ifndef MotifProjectRoot #ifndef MotifProjectRoot
# if defined(OpenBSDArchitecture) # if defined(FreeBSDArchitecture)
# define MotifProjectRoot /usr/local
# elif defined(OpenBSDArchitecture)
# define MotifProjectRoot /usr/local # define MotifProjectRoot /usr/local
# endif # endif
#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 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. 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 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
#endif #endif

View file

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

View file

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

View file

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

View file

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

View file

@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
#define PassCDebugFlags #define PassCDebugFlags
/* due to split-VOB setup, force help to come last in make Makefiles */ /* 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 XCOMM we cannot build guides on linux yet
SUBDIRS = help SUBDIRS = help
BSUBDIRS = help BSUBDIRS = help

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.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)) 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 TEMPLATE_OBJS = TKTemplate.o
RealLibrary(OLAFParse,$(OBJS),$(LIBDIR)) RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs)) SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))

View file

@ -206,7 +206,7 @@ ALL_MMDB_OBJS = $(API_OBJS) $(BTREE_OBJS) \
#ifdef AIXArchitecture #ifdef AIXArchitecture
Libs=$(ALL_MMDB_OBJS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB) 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) Libs=$(MMDB_LIBS) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(MATH_LIB)
#else #else
Libs=$(MMDB_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB) Libs=$(MMDB_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)

View file

@ -181,13 +181,13 @@ ALL_MMDB_OBJS = $(API_OBJS) $(BTREE_OBJS) \
#ifdef AIXArchitecture #ifdef AIXArchitecture
Libs = $(ALL_MMDB_OBJS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB) 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) Libs=$(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB)
#else #else
Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB) Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
#endif #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) Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB) $(MATH_LIB)
#else #else
Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB) 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(dbdrv,main.o,$(Libs))
SimpleCPlusPlusProgram(restore,restore.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)) SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
#else #else
SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API)) SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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