head 1.8; access; symbols netbsd-7-2-RELEASE:1.7 netbsd-7-1-2-RELEASE:1.7 netbsd-7-1-1-RELEASE:1.7 netbsd-7-1:1.7.0.40 netbsd-7-1-RELEASE:1.7 netbsd-7-1-RC2:1.7 netbsd-7-1-RC1:1.7 netbsd-7-0-2-RELEASE:1.7 netbsd-7-0-1-RELEASE:1.7 netbsd-7-0:1.7.0.38 netbsd-7-0-RELEASE:1.7 netbsd-7-0-RC3:1.7 netbsd-7-0-RC2:1.7 netbsd-7-0-RC1:1.7 netbsd-5-2-3-RELEASE:1.7 netbsd-5-1-5-RELEASE:1.7 netbsd-6-0-6-RELEASE:1.7 netbsd-6-1-5-RELEASE:1.7 netbsd-7:1.7.0.36 netbsd-7-base:1.7 netbsd-6-1-4-RELEASE:1.7 netbsd-6-0-5-RELEASE:1.7 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.7 riastradh-drm2:1.7.0.34 riastradh-drm2-base:1.7 netbsd-6-1-3-RELEASE:1.7 netbsd-6-0-4-RELEASE:1.7 netbsd-5-2-2-RELEASE:1.7 netbsd-5-1-4-RELEASE:1.7 netbsd-6-1-2-RELEASE:1.7 netbsd-6-0-3-RELEASE:1.7 netbsd-5-2-1-RELEASE:1.7 netbsd-5-1-3-RELEASE:1.7 netbsd-6-1-1-RELEASE:1.7 netbsd-6-1:1.7.0.32 netbsd-6-0-2-RELEASE:1.7 netbsd-6-1-RELEASE:1.7 netbsd-6-1-RC4:1.7 netbsd-6-1-RC3:1.7 netbsd-6-1-RC2:1.7 netbsd-6-1-RC1:1.7 netbsd-5-2:1.7.0.30 netbsd-6-0-1-RELEASE:1.7 netbsd-5-2-RELEASE:1.7 netbsd-5-2-RC1:1.7 netbsd-6-0:1.7.0.28 netbsd-6-0-RELEASE:1.7 netbsd-6-0-RC2:1.7 netbsd-6-0-RC1:1.7 netbsd-6:1.7.0.26 netbsd-6-base:1.7 netbsd-5-1-2-RELEASE:1.7 netbsd-5-1-1-RELEASE:1.7 netbsd-5-1:1.7.0.24 netbsd-5-1-RELEASE:1.7 netbsd-5-1-RC4:1.7 netbsd-5-1-RC3:1.7 netbsd-5-1-RC2:1.7 netbsd-5-1-RC1:1.7 netbsd-5-0-2-RELEASE:1.7 netbsd-5-0-1-RELEASE:1.7 netbsd-5-0:1.7.0.22 netbsd-5-0-RELEASE:1.7 netbsd-5-0-RC4:1.7 netbsd-5-0-RC3:1.7 netbsd-5-0-RC2:1.7 netbsd-5-0-RC1:1.7 netbsd-5:1.7.0.20 netbsd-5-base:1.7 netbsd-4-0-1-RELEASE:1.7 netbsd-4-0:1.7.0.18 netbsd-4-0-RELEASE:1.7 netbsd-4-0-RC5:1.7 netbsd-4-0-RC4:1.7 netbsd-4-0-RC3:1.7 netbsd-4-0-RC2:1.7 netbsd-4-0-RC1:1.7 netbsd-3-1-1-RELEASE:1.7 netbsd-3-0-3-RELEASE:1.7 abandoned-netbsd-4-base:1.7 abandoned-netbsd-4:1.7.0.12 netbsd-3-1:1.7.0.14 netbsd-3-1-RELEASE:1.7 netbsd-3-0-2-RELEASE:1.7 netbsd-3-1-RC4:1.7 netbsd-3-1-RC3:1.7 netbsd-3-1-RC2:1.7 netbsd-3-1-RC1:1.7 netbsd-4:1.7.0.16 netbsd-4-base:1.7 netbsd-3-0-1-RELEASE:1.7 netbsd-3-0:1.7.0.10 netbsd-3-0-RELEASE:1.7 netbsd-3-0-RC6:1.7 netbsd-3-0-RC5:1.7 netbsd-3-0-RC4:1.7 netbsd-3-0-RC3:1.7 netbsd-3-0-RC2:1.7 netbsd-3-0-RC1:1.7 netbsd-2-0-3-RELEASE:1.7 netbsd-2-1:1.7.0.8 netbsd-2-1-RELEASE:1.7 netbsd-2-1-RC6:1.7 netbsd-2-1-RC5:1.7 netbsd-2-1-RC4:1.7 netbsd-2-1-RC3:1.7 netbsd-2-1-RC2:1.7 netbsd-2-1-RC1:1.7 netbsd-2-0-2-RELEASE:1.7 v4-5-0:1.1.1.6 v4-5-0_beforeimport:1.7 netbsd-3:1.7.0.6 netbsd-3-base:1.7 netbsd-2-0-1-RELEASE:1.7 netbsd-2:1.7.0.4 netbsd-2-base:1.7 netbsd-2-0-RELEASE:1.7 netbsd-2-0-RC5:1.7 netbsd-2-0-RC4:1.7 netbsd-2-0-RC3:1.7 netbsd-2-0-RC2:1.7 netbsd-2-0-RC1:1.7 netbsd-2-0:1.7.0.2 netbsd-2-0-base:1.7 v4-4-0:1.1.1.6 v4-4-0_beforeimport:1.6 netbsd-1-6-PATCH002-RELEASE:1.6 netbsd-1-6-PATCH002:1.6 netbsd-1-6-PATCH002-RC4:1.6 v4-3-0-2003-12-19:1.1.1.5 netbsd-1-6-PATCH002-RC3:1.6 netbsd-1-6-PATCH002-RC2:1.6 netbsd-1-6-PATCH002-RC1:1.6 netbsd-1-6:1.6.0.2 netbsd-1-6-base:1.6 v4-3-0:1.1.1.5 v4-3-0_beforeimport:1.4 netbsd-1-6-PATCH001:1.4 netbsd-1-6-RELEASE:1.4 v4-2-1:1.1.1.4 v4-2-1_beforeimport:1.4 netbsd-1-5-PATCH003:1.4 v4-2-0:1.1.1.4 netbsd-1-5-PATCH002:1.3 netbsd-1-5-PATCH001:1.2 v4-1-0:1.1.1.3 v4-0-3:1.1.1.2 v4-0-2:1.1.1.1 XF86:1.1.1; locks; strict; comment @# @; 1.8 date 2015.07.23.08.12.32; author mrg; state dead; branches; next 1.7; commitid 3Fk7MoycOv7VSnuy; 1.7 date 2004.03.05.16.32.44; author tron; state Exp; branches; next 1.6; 1.6 date 2003.10.18.18.06.38; author tron; state Exp; branches; next 1.5; 1.5 date 2003.02.28.21.49.18; author tron; state Exp; branches; next 1.4; 1.4 date 2002.01.19.23.19.29; author tron; state Exp; branches; next 1.3; 1.3 date 2001.06.09.17.08.10; author tron; state Exp; branches; next 1.2; 1.2 date 2001.05.21.20.43.52; author jlam; state Exp; branches; next 1.1; 1.1 date 2001.01.01.12.43.50; author veego; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.01.01.12.43.50; author veego; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2001.03.18.16.55.46; author veego; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2001.06.09.14.52.54; author tron; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2002.01.19.14.53.39; author tron; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2003.02.28.13.18.41; author tron; state Exp; branches; next 1.1.1.6; 1.1.1.6 date 2004.03.05.14.23.51; author tron; state Exp; branches; next ; desc @@ 1.8 log @remove obsolete XFree86 sources. @ text @XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld 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 */ #if !UseElfFormat #ifndef SharedXlibi18nReqs #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #endif #ifndef SharedXtReqs #define SharedXtReqs /**/ #endif #ifndef SharedXawReqs #define SharedXawReqs /**/ #endif #ifndef SharedXmuReqs # if !defined(Mc68020Architecture) || !defined(OpenBSDArchitecture) # define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB) # else /* At least the hp300 and the sun3 OpenBSD ports need that */ # define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) # endif #endif #ifndef SharedXcursorReqs #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #endif #else /* UseElfFormat */ /* * NetBSD/FreeBSD/OpenBSD (ELF) shared library template * Cloned from Linux ELF rules, but with a minor number. */ #ifndef FixupLibReferences #define FixupLibReferences() @@@@\ XMULIBONLY = -lXmu @@@@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif #ifndef XawClientLibs #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) #endif /* Allow for libpthread, as overridden by OS definitions */ #if !defined(SharedX11Reqs) #define SharedX11Reqs #endif #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) #ifndef SharedXtReqs #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) $(XONLYLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXiReqs $(LDPRELIBS) $(XLIB) #define SharedXpReqs $(LDPRELIB) $(XLIB) #define SharedXpmReqs $(LDPRELIB) $(XLIB) #define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIBS) $(XLIB) #define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedSMReqs $(LDPRELIBS) $(ICELIB) #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 */ @ 1.7 log @Resolve conflicts from import of XFree86 4.4.0. @ text @@ 1.6 log @Pull-in changes for XFree86-current which enable shared version of various libraries (e.g. "libXss"). This fixes problems with various 3rd party applications which required those shared versions. Thanks to Matthieu Herrb for discussing this issue with the XFree86 core team. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.12 2003/01/12 02:44:25 dawes Exp $ d10 4 d25 1 a25 1 # define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(EXTENSIONLIB) $(XONLYLIB) d28 3 a48 2 #define CplusplusLibC d53 3 a55 1 #define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) d57 1 a57 1 #define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) d62 2 a63 2 #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) d65 1 a65 1 #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) a66 1 #define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary d68 1 a68 1 #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) a69 1 #define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) d72 4 a75 1 #define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc d77 1 @ 1.5 log @Resolve conflicts from import of XFree86 4.3.0. @ text @a62 1 #define SharedXssReqs $(LDPRELIB) $(XLIB) $(EXTENSIONLIB) $(XTOOLLIB) d74 10 a83 1 @ 1.4 log @Resolve conflicts from last import. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.9 2001/05/24 16:34:49 dawes Exp $ d28 1 a28 1 * NetBSD/FreeBSD (ELF) shared library template a42 1 #define FrescoSysLibs CplusplusLibC MathLibrary d55 1 d58 2 d61 3 d66 1 d68 7 a74 2 #define SharedFrescoReqs $(LDPRELIBS) $(XLIBONLY) FrescoSysLibs #define SharedXtfReqs $(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs @ 1.3 log @Resolve conflicts from import of XFree86 4.1.0. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.8.2.1 2001/05/24 16:35:38 dawes Exp $ @ 1.2 log @Apply patch from xsrc/12935 to fix problems with building libraries when X11ProjectRoot is defined. From the description in the PR: The following patch fixes bsdLib.rules and bsdLib.tmpl to use the proper Makefile variables when building libraries. In bsdLib.rules, instead of passing $(USRLIBDIR) to the linker for the rpath, $(USRLIBDIRPATH) is passed instead, which is already conditionally set to the correct value depending on the definition of X11ProjectRoot. In bsdLib.tmpl, instead of using $(LDPRELIB), use $(LDPRELIBS) instead, which is a superset of the value of $(LDPRELIB), but also conditionally contains linker directives to search in $(X11PROJECT)/lib for libraries when X11ProjectRoot is defined. @ text @d1 2 a2 2 XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.5 1999/06/06 12:13:22 dawes Exp $ d50 1 d52 1 @ 1.1 log @Initial revision @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.6 2000/08/28 15:29:08 dawes Exp $ d49 13 a61 13 #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #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) #define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary #define SharedXtstReqs $(LDPRELIB) $(XLIB) #define SharedXieReqs $(LDPRELIB) $(XLIBONLY) #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs #define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs @ 1.1.1.1 log @Initial import of XFree86 4.x @ text @@ 1.1.1.2 log @Import of XFree86 4.0.3 @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.5 1999/06/06 12:13:22 dawes Exp $ @ 1.1.1.3 log @Import of XFree86 4.1.0. @ text @d1 2 a2 2 XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.8.2.1 2001/05/24 16:35:38 dawes Exp $ d49 13 a61 15 #define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) #ifndef SharedXtReqs #define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) #endif #define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) #define SharedXiReqs $(LDPRELIBS) $(XLIB) #define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary #define SharedXtstReqs $(LDPRELIBS) $(XLIB) #define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) #define SharedSMReqs $(LDPRELIBS) $(ICELIB) #define SharedFrescoReqs $(LDPRELIBS) $(XLIBONLY) FrescoSysLibs #define SharedXtfReqs $(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs @ 1.1.1.4 log @Import of XFree86 4.2.0. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.9 2001/05/24 16:34:49 dawes Exp $ @ 1.1.1.5 log @Import of XFree86 4.3.0. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.12 2003/01/12 02:44:25 dawes Exp $ d28 1 a28 1 * NetBSD/FreeBSD/OpenBSD (ELF) shared library template d43 1 a55 1 #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) a57 2 #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) #define SharedXpmReqs $(LDPRELIB) $(XLIB) a58 3 #define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) #define SharedXssReqs $(LDPRELIB) $(XLIB) $(EXTENSIONLIB) $(XTOOLLIB) a60 1 #define SharedXvReqs $(LDPRELIB) $(XLIB) d62 2 a63 7 #define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc #define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) #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) @ 1.1.1.6 log @Import of XFree86 4.4.0. @ text @d2 1 a2 1 XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.24 2003/11/20 16:18:19 dawes Exp $ a9 4 #ifndef SharedXlibi18nReqs #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #endif d21 1 a21 1 # define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) a23 3 #ifndef SharedXcursorReqs #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #endif d42 2 d48 1 a48 3 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) d50 1 a50 1 #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) d55 2 a56 2 #define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) d58 1 a58 1 #define SharedXpReqs $(LDPRELIB) $(XLIB) d60 1 d62 2 a63 1 #define SharedXrenderReqs $(LDPRELIB) $(XLIB) d65 1 d68 1 a68 4 #ifndef SharedGLReqs #define SharedGLReqs $(LDPRELIBS) $(XLIB) #endif #ifndef SharedGLUReqs a69 1 #endif d75 1 a75 10 #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) @