[src/trunk]: src/x11/Xserver/Xserver/XFree86 Fix up LDADD and DPADD for recen...

[rtr <rtr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb7320706dce
branches:  trunk
changeset: 556646:fb7320706dce
user:      rtr <rtr%NetBSD.org@localhost>
date:      Tue Dec 23 03:33:41 2003 +0000

description:
Fix up LDADD and DPADD for recent Xserver/* changes.

diffstat:

 x11/Xserver/Xserver/XFree86/Makefile  |  48 +++++++++++++++++-----------------
 x11/Xserver/Xserver/XFree86/XFree86.c |   1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diffs (70 lines):

diff -r c32bac95200a -r fb7320706dce x11/Xserver/Xserver/XFree86/Makefile
--- a/x11/Xserver/Xserver/XFree86/Makefile      Tue Dec 23 03:18:13 2003 +0000
+++ b/x11/Xserver/Xserver/XFree86/Makefile      Tue Dec 23 03:33:41 2003 +0000
@@ -1,37 +1,37 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:07 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/12/23 03:33:41 rtr Exp $
 
 .include <bsd.own.mk>
 
 PROG=  XFree86
+BINMODE=4711
+
+MAN=   XFree86.1
+# XF86Config.5
+
+
 .PATH:  ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86
-MAN=   XFree86.1 XF86Config.5
 
 .include "../Makefile.Xserver"
 
-LDADD+=        ${LIBDIR.xkb}/xf86KillSrv.o ${LIBDIR.xkb}/xf86VT.o \
-       ${LIBDIR.xkb}/xf86Private.o \
-#      ../../programs/Xserver/hw/xfree86/common/xf86Init.o
-#      ../../programs/Xserver/hw/xfree86/common/xf86IniExt.o
-#      ../../programs/Xserver/hw/xfree86/common/libxf86.a
-#      ../../programs/Xserver/hw/xfree86/parser/libxf86config.a
-#      ../../programs/Xserver/hw/xfree86/os-support/libxf86_os.a
-#      ../../programs/Xserver/hw/xfree86/loader/libloader.a
-#      ../../programs/Xserver/hw/xfree86/common/libxf86.a
+LDADD= ${LIBDIR.xkb}/xf86KillSrv.o ${LIBDIR.xkb}/xf86VT.o \
+       ${LIBDIR.xkb}/xf86Private.o ${LIBDIR.hw/xfree86/xf86}/xf86Init.o \
+       ${LIBDIR.hw/xfree86/xf86}/xf86IniExt.o
 
-LDADD+=        ${LDADD.dix} ${LDADD.os} -lXau -lXdmcp \
-#      ../../lib/font/fontbase.o
-#      ../../lib/font/libfontbase.a
-
-LDADD+=        ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-#      ../../programs/Xserver/hw/xfree86/common/libxf86.a
+LDADD+=        ${LDADD.hw/xfree86/xf86} ${LDADD.hw/xfree86/xf86config} \
+       ${LDADD.hw/xfree86/xf86_os} ${LDADD.hw/xfree86/loader} \
+       ${LDADD.hw/xfree86/xf86} ${LDADD.dix} ${LDADD.os} -lXau -lXdmcp \
+       ${LDADD.fontbase} ${LDADD.Xext/exts} ${LDADD.xkb} \
+       ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
+       ${LDADD.hw/xfree86/xf86} ${LDADD.Xext/exts} ${LDADD.xkb} \
+       ${LDADD.xinput} ${LDADD.lbx} -llbxutil ${LDADD.randr} \
+       ${LDADD.render} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/exts} \
+       ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
+       ${LDADD.randr} ${LDADD.render} ${LDADD.hw/xfree86/xf86_os} \
+       -lz -lm
 
-LDADD+=        ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-       ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} ${LDADD.mi} \
-       ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-       ${LDADD.randr} ${LDADD.render} \
-#      ../../programs/Xserver/hw/xfree86/os-support/libxf86_os.a
-
-LDADD+=        -lz -lm -li386
+.if ${MACHINE} == "i386"
+LDADD+=        -li386
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r c32bac95200a -r fb7320706dce x11/Xserver/Xserver/XFree86/XFree86.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/Xserver/XFree86/XFree86.c     Tue Dec 23 03:33:41 2003 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: XFree86.c,v 1.1 2003/12/23 03:33:41 rtr Exp $ */