diff options
| author | veego <veego@NetBSD.org> | 2008-11-06 22:28:25 +0000 |
|---|---|---|
| committer | veego <veego@NetBSD.org> | 2008-11-06 22:28:25 +0000 |
| commit | a74f73830cecd08dbd26997deb2bcae26cd9ea2d (patch) | |
| tree | 4852a50d4dc61328a1fe1f8ea41b3248f75aeb05 /external | |
| parent | 9263b0c23bffcfd56b267e1494669de80fd951be (diff) | |
Add missing LIBDPLIBS, found by using 'LDFLAGS += -Wl,-z,defs' and sort
src/external/mit/xorg/lib/Makefile to match the new order.
Diffstat (limited to 'external')
21 files changed, 95 insertions, 37 deletions
diff --git a/external/mit/xorg/lib/Makefile b/external/mit/xorg/lib/Makefile index c5e4e79bd31..c6260e78a09 100644 --- a/external/mit/xorg/lib/Makefile +++ b/external/mit/xorg/lib/Makefile @@ -1,17 +1,24 @@ -# $NetBSD: Makefile,v 1.5 2008/11/01 18:42:51 cube Exp $ +# $NetBSD: Makefile,v 1.6 2008/11/06 22:28:25 veego Exp $ # build libraries for xorg -SUBDIR= libFS libICE libXau libXdmcp libdrm freetype libfontenc expat \ - libOSMesa .WAIT \ - fontconfig libSM libX11 .WAIT \ - libXext .WAIT \ - libXfixes libxkbfile libXt libXScrnSaver libXevie libXi libXinerama \ - libXp libXrender libXres libXtst libXv libXxf86dga libXxf86misc \ - libXxf86vm libXfontcache xkbdata liblbxutil .WAIT \ - libXcomposite libXdamage libXcursor libXrandr libXTrap libXmu \ - libXmuu libXpm pixman \ - libXprintUtil libXprintAppUtil libXfont libXvMC libxkbui .WAIT \ - libXft libXaw6 libXaw7 libXaw libGL .WAIT dri libGLU libGLw - +SUBDIR= dri expat libfontenc freetype libFS libICE libOSMesa \ + libXau libXdmcp libdrm pixman xkbdata \ + .WAIT \ + fontconfig libSM libX11 liblbxutil \ + .WAIT \ + libXcomposite libXdamage libXext libXfixes libXi libXt \ + libxkbfile \ + .WAIT \ + libXp libXxf86vm \ + .WAIT \ + libGL libXScrnSaver libXTrap libXevie libXfont libXfontcache \ + libXinerama libXmu libXmuu libXpm libXprintUtil libXrender \ + libXres libXtst libXvMC libXv libXxf86dga libXxf86misc libxkbui \ + .WAIT \ + libGLU libGLw libXaw6 libXaw7 libXaw libXcursor libXprintAppUtil \ + libXrandr \ + .WAIT \ + libXft + .include <bsd.subdir.mk> diff --git a/external/mit/xorg/lib/libOSMesa/Makefile b/external/mit/xorg/lib/libOSMesa/Makefile index 92c8ed0f567..57ae97cc3e4 100644 --- a/external/mit/xorg/lib/libOSMesa/Makefile +++ b/external/mit/xorg/lib/libOSMesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/26 07:15:53 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -125,5 +125,7 @@ CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/${_path_} CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/${_path_} .endfor +LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm + .include <bsd.x11.mk> .include <bsd.lib.mk> diff --git a/external/mit/xorg/lib/libXScrnSaver/Makefile b/external/mit/xorg/lib/libXScrnSaver/Makefile index db9d50411fa..dba7d87c5ba 100644 --- a/external/mit/xorg/lib/libXScrnSaver/Makefile +++ b/external/mit/xorg/lib/libXScrnSaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/05 03:15:20 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -10,7 +10,8 @@ SRCS= XScrnSaver.c CPPFLAGS+= ${X11FLAGS.THREADLIB} #CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \ + Xext ${.CURDIR}/../libXext MAN= Xss.3 MLINKS= Xss.3 XScreenSaverAllocInfo.3 \ diff --git a/external/mit/xorg/lib/libXcomposite/Makefile b/external/mit/xorg/lib/libXcomposite/Makefile index d653dfb2339..1628c1bcd73 100644 --- a/external/mit/xorg/lib/libXcomposite/Makefile +++ b/external/mit/xorg/lib/libXcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/05 02:28:01 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -13,6 +13,8 @@ SRCS= Xcomposite.c INCS= Xcomposite.h INCSDIR=${X11INCDIR}/X11/extensions +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic + MAN= Xcomposite.3 MLINKS= Xcomposite.3 XCompositeCreateRegionFromBorderClip.3 \ Xcomposite.3 XCompositeGetOverlayWindow.3 \ diff --git a/external/mit/xorg/lib/libXdamage/Makefile b/external/mit/xorg/lib/libXdamage/Makefile index e0dbe425086..59a7fe6f2ec 100644 --- a/external/mit/xorg/lib/libXdamage/Makefile +++ b/external/mit/xorg/lib/libXdamage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -14,6 +14,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions INCS= Xdamage.h INCSDIR=${X11INCDIR}/X11/extensions +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXevie/Makefile b/external/mit/xorg/lib/libXevie/Makefile index 687e381142c..a9c8aeb0fee 100644 --- a/external/mit/xorg/lib/libXevie/Makefile +++ b/external/mit/xorg/lib/libXevie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/05 02:05:39 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -20,6 +20,9 @@ MLINKS= Xevie.3 XevieQueryVersion.3 \ Xevie.3 XevieSendEvent.3 \ Xevie.3 XevieEnd.3 +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \ + Xext ${.CURDIR}/../libXext + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXfixes/Makefile b/external/mit/xorg/lib/libXfixes/Makefile index 96b305124ca..b143a1d0ba7 100644 --- a/external/mit/xorg/lib/libXfixes/Makefile +++ b/external/mit/xorg/lib/libXfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/05 00:53:12 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:25 veego Exp $ .include <bsd.own.mk> @@ -17,6 +17,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions MAN= Xfixes.3 +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXfont/Makefile b/external/mit/xorg/lib/libXfont/Makefile index f9655205fdc..0a505979cbf 100644 --- a/external/mit/xorg/lib/libXfont/Makefile +++ b/external/mit/xorg/lib/libXfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/09/13 04:32:30 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -57,7 +57,11 @@ LIBDPLIBS=\ SM ${.CURDIR}/../libSM \ ICE ${.CURDIR}/../libICE \ Xext ${.CURDIR}/../libXext \ - X11 ${.CURDIR}/../libX11/dynamic + fontenc ${.CURDIR}/../libfontenc \ + freetype ${.CURDIR}/../freetype \ + X11 ${.CURDIR}/../libX11/dynamic \ + m ${.CURDIR}/../../../../../lib/libm \ + z ${.CURDIR}/../../../../../lib/libz # XXX COPTS.ffcheck.c+= -Wno-error diff --git a/external/mit/xorg/lib/libXft/Makefile b/external/mit/xorg/lib/libXft/Makefile index 61113b2700c..bbcfdfeb187 100644 --- a/external/mit/xorg/lib/libXft/Makefile +++ b/external/mit/xorg/lib/libXft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/10/24 19:49:54 cube Exp $ +# $NetBSD: Makefile,v 1.5 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -23,7 +23,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xft LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \ fontconfig ${.CURDIR}/../fontconfig/src \ freetype ${.CURDIR}/../freetype \ - Xrandr ${.CURDIR}/../libXrandr + Xrandr ${.CURDIR}/../libXrandr \ + Xrender ${.CURDIR}/../libXrender PKGDIST= ${LIB} diff --git a/external/mit/xorg/lib/libXinerama/Makefile b/external/mit/xorg/lib/libXinerama/Makefile index b5919021f7e..835ab4cb1a7 100644 --- a/external/mit/xorg/lib/libXinerama/Makefile +++ b/external/mit/xorg/lib/libXinerama/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/04 22:41:42 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -16,6 +16,9 @@ MLINKS= Xinerama.3 XineramaQueryExtension.3 \ Xinerama.3 XineramaIsActive.3 \ Xinerama.3 XineramaQueryScreens.3 +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXprintAppUtil/Makefile b/external/mit/xorg/lib/libXprintAppUtil/Makefile index 41c84688fdf..dc412c912d3 100644 --- a/external/mit/xorg/lib/libXprintAppUtil/Makefile +++ b/external/mit/xorg/lib/libXprintAppUtil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -11,6 +11,10 @@ SRCS= xpapputil.c INCS= xpapputil.h INCSDIR=${X11INCDIR}/X11/XprintAppUtil +LIBDPLIBS= XprintUtil ${.CURDIR}/../libXprintUtil \ + Xp ${.CURDIR}/../libXp \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXprintUtil/Makefile b/external/mit/xorg/lib/libXprintUtil/Makefile index 705f53dcdd6..e120ecfd2e2 100644 --- a/external/mit/xorg/lib/libXprintUtil/Makefile +++ b/external/mit/xorg/lib/libXprintUtil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -13,6 +13,9 @@ INCSDIR=${X11INCDIR}/X11/XprintUtil CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/XprintUtil +LIBDPLIBS= Xp ${.CURDIR}/../libXp \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXres/Makefile b/external/mit/xorg/lib/libXres/Makefile index 6942c84cc32..95ce2d68ca5 100644 --- a/external/mit/xorg/lib/libXres/Makefile +++ b/external/mit/xorg/lib/libXres/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/10/04 21:59:49 cube Exp $ +# $NetBSD: Makefile,v 1.7 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -20,6 +20,9 @@ MLINKS= XRes.3 XResQueryExtension.3 \ XRes.3 XResQueryClientResources.3 \ XRes.3 XResQueryClientPixmapBytes.3 +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= Xres .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXvMC/Makefile b/external/mit/xorg/lib/libXvMC/Makefile index 06fc36f4582..366e2ddc3fd 100644 --- a/external/mit/xorg/lib/libXvMC/Makefile +++ b/external/mit/xorg/lib/libXvMC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -13,6 +13,9 @@ INCSDIR=${X11INCDIR}/X11/extensions CPPFLAGS+= ${X11FLAGS.THREADLIB} +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXxf86dga/Makefile b/external/mit/xorg/lib/libXxf86dga/Makefile index 889f7d35337..9a044a7b046 100644 --- a/external/mit/xorg/lib/libXxf86dga/Makefile +++ b/external/mit/xorg/lib/libXxf86dga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -35,6 +35,9 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} # XXX CPPFLAGS.XF86DGA2.c= -Wno-error +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXxf86misc/Makefile b/external/mit/xorg/lib/libXxf86misc/Makefile index b756d070534..30fdff005ec 100644 --- a/external/mit/xorg/lib/libXxf86misc/Makefile +++ b/external/mit/xorg/lib/libXxf86misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/10/04 18:32:25 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -17,6 +17,9 @@ MLINKS= XF86Misc.3 XF86MiscGetKbdSettings.3 \ XF86Misc.3 XF86MiscSetMouseSettings.3 \ XF86Misc.3 XF86MiscSetSaver.3 +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libXxf86vm/Makefile b/external/mit/xorg/lib/libXxf86vm/Makefile index 6fe010daf29..4f27b2c3791 100644 --- a/external/mit/xorg/lib/libXxf86vm/Makefile +++ b/external/mit/xorg/lib/libXxf86vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -30,6 +30,9 @@ MLINKS= XF86VM.3 XF86VidModeQueryExtension.3 \ XF86VM.3 XF86VidModeGetGammaRampSize.3 \ XF86VM.3 XF86VidModeGetPermissions.3 +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + PKGDIST= ${LIB} .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/liblbxutil/Makefile b/external/mit/xorg/lib/liblbxutil/Makefile index a9306c986e9..146539e41a3 100644 --- a/external/mit/xorg/lib/liblbxutil/Makefile +++ b/external/mit/xorg/lib/liblbxutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -22,7 +22,8 @@ CLEANFILES+= g3states.h CPPFLAGS+= ${X11FLAGS.THREADLIB} -I. -LIBDPLIBS=z ${.CURDIR}/../../../../../lib/libz +LIBDPLIBS= z ${.CURDIR}/../../../../../lib/libz \ + Xdmcp ${.CURDIR}/../libXdmcp PKGCONFIG= lbxutil diff --git a/external/mit/xorg/lib/libxkbfile/Makefile b/external/mit/xorg/lib/libxkbfile/Makefile index 6e083f44d23..120c4eadbb9 100644 --- a/external/mit/xorg/lib/libxkbfile/Makefile +++ b/external/mit/xorg/lib/libxkbfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -17,6 +17,8 @@ INCSDIR=${X11INCDIR}/X11/extensions INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h INCSDIR=${X11INCDIR}/X11/extensions +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic + PKGCONFIG= xkbfile .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/libxkbui/Makefile b/external/mit/xorg/lib/libxkbui/Makefile index ac3f9b6f47b..0b77eab61ab 100644 --- a/external/mit/xorg/lib/libxkbui/Makefile +++ b/external/mit/xorg/lib/libxkbui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:26 veego Exp $ .include <bsd.own.mk> @@ -13,6 +13,10 @@ INCSDIR=${X11INCDIR}/X11/extensions CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/X11/extensions +LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \ + xkbfile ${.CURDIR}/../libxkbfile \ + m ${.CURDIR}/../../../../../lib/libm + PKGCONFIG= xkbui .include <bsd.x11.mk> diff --git a/external/mit/xorg/lib/pixman/Makefile b/external/mit/xorg/lib/pixman/Makefile index 2deccc485d3..2730f07535c 100644 --- a/external/mit/xorg/lib/pixman/Makefile +++ b/external/mit/xorg/lib/pixman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/10/30 08:16:20 veego Exp $ +# $NetBSD: Makefile,v 1.7 2008/11/06 22:28:26 veego Exp $ NOLINT= 1 # defined @@ -39,6 +39,8 @@ CPPFLAGS+= -DPIXMAN_DISABLE_DEPRECATED -DHAVE_CONFIG_H \ -I${X11SRCDIR.pixman}/../combine \ -I${X11SRCDIR.pixman}/pixman +LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm + PKGCONFIG= pixman-1 PKGDIST= pixman |
