29baf2b6c9
2.2 and the new support for antialiased fonts (using Xft) and UTF-8. I take maintainership of OpenMotif with this update. ok simon@, kurt@, jasper@
72 lines
2.5 KiB
Plaintext
72 lines
2.5 KiB
Plaintext
$OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.2 2007/07/18 21:41:05 mbalmer Exp $
|
|
--- config/cf/bsdLib.tmpl.orig Sat Jan 5 16:20:51 2002
|
|
+++ config/cf/bsdLib.tmpl Sat Jun 30 10:25:57 2007
|
|
@@ -1,5 +1,5 @@
|
|
XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $
|
|
-XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.3 1999/12/02 14:27:24 hohndel Exp $
|
|
+XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.6 2000/08/28 15:29:08 dawes Exp $
|
|
|
|
/*
|
|
* NetBSD/FreeBSD/OpenBSD shared library template
|
|
@@ -7,12 +7,6 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.3 199
|
|
|
|
#if !UseElfFormat
|
|
|
|
-#ifndef FixupLibReferences
|
|
-#define FixupLibReferences() @@\
|
|
-XMULIBONLY = -lXmu @@\
|
|
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
|
|
-#endif
|
|
-
|
|
#ifndef SharedXtReqs
|
|
#define SharedXtReqs /**/
|
|
#endif
|
|
@@ -42,26 +36,20 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
|
|
#endif
|
|
|
|
#ifndef XawClientLibs
|
|
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
|
|
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
|
|
#endif
|
|
|
|
#define CplusplusLibC
|
|
#define FrescoSysLibs CplusplusLibC MathLibrary
|
|
|
|
-#if ThreadedX
|
|
-# ifdef BuildThreadStubLibrary
|
|
-# define SharedThreadReqs -L$(BUILDLIBDIR) -lXThrStub
|
|
-# else
|
|
-# define SharedThreadReqs -pthread
|
|
-# endif
|
|
-#else
|
|
-# define SharedThreadReqs /**/
|
|
+/* Allow for libpthread, as overridden by OS definitions */
|
|
+#if !defined(SharedX11Reqs)
|
|
+#define SharedX11Reqs
|
|
#endif
|
|
-
|
|
-#define SharedX11Reqs SharedThreadReqs
|
|
#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
|
|
-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
|
|
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
|
|
+#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
|
|
+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
|
|
+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
|
|
#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
|
|
#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
|
|
#define SharedXiReqs $(LDPRELIB) $(XLIB)
|
|
@@ -72,9 +60,10 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
|
|
#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs
|
|
#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
|
|
|
|
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB)
|
|
#define SharedXmReqs $(LDPRELIBS) SharedXReqs
|
|
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
|
|
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
|
|
+
|
|
+#ifndef SharedXReqs
|
|
+# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
|
|
+#endif
|
|
|
|
#endif /* UseElfFormat */
|