diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:55 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:55 +0000 |
| commit | ea2a0b7d5958a702bdbcecc17c9c4dea8ce6def5 (patch) | |
| tree | fd868165c6da4b6f2ad504733f27803878a9d9bb /bsdLib.tmpl | |
| parent | 272f68b2bffd736cede856a96231afe237261c8d (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'bsdLib.tmpl')
| -rw-r--r-- | bsdLib.tmpl | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/bsdLib.tmpl b/bsdLib.tmpl index 07145e8..f582d1b 100644 --- a/bsdLib.tmpl +++ b/bsdLib.tmpl @@ -1,5 +1,5 @@ XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.12 2003/01/12 02:44:25 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.24 2003/11/20 16:18:19 dawes Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template @@ -7,6 +7,10 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.12 2003/01/12 02:44:25 dawes Exp $ #if !UseElfFormat +#ifndef SharedXlibi18nReqs +#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) +#endif + #ifndef SharedXtReqs #define SharedXtReqs /**/ #endif @@ -18,9 +22,12 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.12 2003/01/12 02:44:25 dawes Exp $ # define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB) # else /* At least the hp300 and the sun3 OpenBSD ports need that */ -# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(EXTENSIONLIB) $(XONLYLIB) +# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) # endif #endif +#ifndef SharedXcursorReqs +#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) +#endif #else /* UseElfFormat */ @@ -39,38 +46,48 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) #endif -#define CplusplusLibC - /* Allow for libpthread, as overridden by OS definitions */ #if !defined(SharedX11Reqs) #define SharedX11Reqs #endif -#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) + +#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) +#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) #ifndef SharedXtReqs -#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) +#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) #endif #define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) -#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) +#define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXiReqs $(LDPRELIBS) $(XLIB) -#define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) +#define SharedXpReqs $(LDPRELIB) $(XLIB) #define SharedXpmReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary #define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -#define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) -#define SharedXssReqs $(LDPRELIB) $(XLIB) $(EXTENSIONLIB) $(XTOOLLIB) +#define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIBS) $(XLIB) -#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) #define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedSMReqs $(LDPRELIBS) $(ICELIB) -#define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc +#ifndef SharedGLReqs +#define SharedGLReqs $(LDPRELIBS) $(XLIB) +#endif +#ifndef SharedGLUReqs #define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#endif #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) #define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB) #define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) - +#define SharedXResReqs $(LDPRELIB) $(XLIB) +#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB) +#define SharedXineramaReqs $(LDPRELIB) $(XLIB) +#define SharedXssReqs $(LDPRELIB) $(XLIB) +#define SharedXvMCReqs $(LDPRELIB) $(XLIB) +#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) +#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) +#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) +#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) +#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) #endif /* UseElfFormat */ |