linux: move dependancy handling out of linux.cf and into new lnxDep.rules file.

[oweals/cde.git] / cde / config / cf / OpenBSD.cf

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index ccde1f89e141dae2afb435ceb39a33b5ebf94a4c..3618840964557f0c0e706739c37cabd90516c8f6 100644 (file)
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -149,6 +149,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /*
  * Compiler Features
  */
+#ifndef HasGcc2ForCplusplus
+#define HasGcc2ForCplusplus    YES
+#endif
 #define GccUsesGas             YES
 #define UseGas                 YES
 #define GnuCpp                 YES
@@ -458,7 +461,6 @@ install:: fonts.alias                                                       @@\
 
 # endif /* XorgServer */
 
-# include <xorg.cf>
 
 #endif /* AlphaArchitecture */
 
@@ -481,6 +483,8 @@ install:: fonts.alias                                                       @@\
 
 # define HasAgpGart            YES
 
+# define LdPostLib             -L/usr/X11R6/lib -L/usr/local/lib
+
 # define ServerExtraSysLibs    -lamd64
 # define ServerExtraDefines    GccGasOption -D_XSERVER64 XFree86ServerDefines
 
@@ -495,7 +499,9 @@ install:: fonts.alias                                                       @@\
 # ifndef HasX86Support
 #  define HasX86Support                YES
 # endif
-/* # include <xorg.cf> */
+
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder            YES
 
 #endif /* AMD64Architecture */
 
@@ -544,13 +550,13 @@ install:: fonts.alias                                                     @@\
 # ifndef DefaultGcc2i386Opt
 #   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
       /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-#     define DefaultGcc2i386Opt        -O2 GccAliasingArgs
+#     define DefaultGcc2i386Opt        -O2 -fno-strict-aliasing
 #   endif
 # endif
 # define OptimizedCDebugFlags  DefaultGcc2i386Opt
 # define ServerOSDefines       XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraSysLibs    -li386
-# define LdPostLib             /**/
+# define LdPostLib             -L/usr/X11R6/lib -L/usr/local/lib
 # define ServerExtraDefines GccGasOption XFree86ServerDefines
 # ifndef XFree86ConsoleDefines
 #   define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
@@ -573,7 +579,9 @@ install:: fonts.alias                                                       @@\
 #  define HasX86Support                UseElfFormat
 # endif
 
-# include <xorg.cf>
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder            YES
+
 
 #endif /* i386Architecture */
 
@@ -609,7 +617,6 @@ install:: fonts.alias                                                       @@\
 
 # define ServerExtraDefines    -DXFree86Server
 
-# include <xorg.cf>
 
 #endif /* AmigaArchitecture */
 
@@ -630,7 +637,6 @@ install:: fonts.alias                                                       @@\
 
 # define ServerExtraDefines    -DXFree86Server
 
-#include <xorg.cf>
 
 #endif /* Hp300Architecture */
 
@@ -646,7 +652,6 @@ install:: fonts.alias                                                       @@\
 
 # define ServerExtraDefines    -DXFree86Server
 
-# include <xorg.cf>
 
 #endif /* mac68kArchitecture */
 
@@ -662,7 +667,6 @@ install:: fonts.alias                                                       @@\
 
 # define ServerExtraDefines    -DXFree86Server
 
-# include <xorg.cf>
 
 #endif /* Mvme68kArchitecture */
 
@@ -712,7 +716,6 @@ install:: fonts.alias                                                       @@\
 #  define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
 
-# include <xorg.cf>
 
 #endif /* MipsArchitecture */
 
@@ -764,7 +767,6 @@ install:: fonts.alias                                                       @@\
 
 # endif /* XorgServer */
 
-# include <xorg.cf>
 
 #endif /* PpcArchitecture */
 
@@ -835,7 +837,6 @@ install:: fonts.alias                                                       @@\
 # ifndef BuildXInputExt
 #  define BuildXInputExt       NO
 # endif
-# include <xorg.cf>
 
 #endif /* SparcArchitecture */
 
@@ -865,7 +866,6 @@ install:: fonts.alias                                                       @@\
 #   define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
 
-# include <xorg.cf>
 
 #endif /* Sparc64Architecture */
 
@@ -892,7 +892,6 @@ install:: fonts.alias                                                       @@\
 # define BuildGlxExt           NO
 # define BuildGLXLibrary       NO
 
-# include <xorg.cf>
 
 #endif /* VaxArchitecture */
  
@@ -903,10 +902,24 @@ install:: fonts.alias                                                     @@\
  * which can be overridden by architecture specific sections above
  */
 
+#ifdef HasGcc2ForCplusplus
+CXXDEPENDINCLUDE != echo | `CcCmd -print-prog-name=cc1plus` -v 2>&1 | \
+                   sed -n 's/ \(.*[cg]++.*\)/-I\1/p'; rm -f gccdump.s
+#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
+#endif
+
 #ifndef StandardDefines
 # define StandardDefines       -DCSRG_BASED 
 #endif
 
+#ifndef StandardIncludes
+# define StandardIncludes      -I/usr/X11R6/include -I/usr/local/include
+#endif
+
+#ifndef TopMotifInclude
+# define TopMotifInclude       /usr/local/include
+#endif
+
 #if !defined(OptimizedCDebugFlags)
 # define OptimizedCDebugFlags  -O2
 #endif
@@ -1019,6 +1032,8 @@ install:: fonts.alias                                                     @@\
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #define CplusplusLibC           -lstdc++
+#define CplusplusOptions       -Wall -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
+#define LibraryCplusplusOptions        -Wall -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
 
 #define ArchitectureDefines    -DOPENBSD_ARCHITECTURE
 
@@ -1028,7 +1043,11 @@ install:: fonts.alias                                                    @@\
 #define KornShell               /usr/local/bin/ksh93
 #endif
 
-#define SharedLibraryLoadFlags -shared /usr/lib/crtbeginS.o /usr/lib/crtendS.o
+#ifndef DtKornShell
+#define DtKornShell            /usr/local/dt/bin/dtksh
+#endif
+
+#define AvoidNullMakeCommand   YES
 
 /* This must come last */
 #include <bsdLib.rules>