Fixes for OpenBSD

[oweals/cde.git] / cde / config / cf / Motif.tmpl

diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index 8deebe9b4f384995f64d8f4814109c9b6e3093b3..dc053ab8fa6cf6bb5bf483d7f18fa11b42b95758 100644 (file)
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -57,7 +57,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
 #endif
 
 #ifndef _MUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
+# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
 #  if UseInstalledMotif
 #   define _MUseCat(a,b,c) a##c
 #  else
@@ -325,31 +325,31 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
 #endif
 
 #ifndef XmClientLibs
-# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
+# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
 #endif
 #ifndef XmClientDepLibs
-# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
+# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 #endif
 
 #ifndef MrmClientLibs 
-# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
+# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
 #endif
 #ifndef MrmClientDepLibs
-# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
+# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 #endif
 
 #ifndef UilClientLibs
-# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
+# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
 #endif
 #ifndef UilClientDepLibs
-# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
+# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 #endif
 
 #ifndef TestClientLibs
 # define TestClientLibs $(PURIFYLIBS) $(TESTCOMLIB) \
                $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
                $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
-       $(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \
+       $(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XLIB) \
        $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
 #endif
 #ifndef TestUilClientLibs
@@ -357,7 +357,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
                $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
                $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
        $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(TESTGEOLIB) \
-       $(XTOOLLIB) $(XPLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
+       $(XTOOLLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
 #endif
 #ifndef TestClientDepLibs
 # define TestClientDepLibs XmClientDepLibs
@@ -578,7 +578,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
 
 #if NeedDefaultDepLibs
 # if HasSharedLibraries || defined(UseInstalled)
-        DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
+        DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 # else
         DEPLIBS = $(LOCAL_LIBRARIES)
 # endif
@@ -590,8 +590,10 @@ 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)
-     MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi
+#elif defined(SunArchitecture)
+  MOTIF_DOC :sh = if test -f ../imports/motif/doc/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
+#elif defined(BSDArchitecture)
+     MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
 #else
       MOTIF_DOC = -D_MOTIFDOC_
 #endif