list most of the correct libs/depends. not so many link errors now.

This commit is contained in:
mrg 2008-08-07 06:37:20 +00:00
parent bbae282081
commit 22e7e15fc7
1 changed files with 58 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2008/08/06 07:38:15 mrg Exp $
# $NetBSD: Makefile,v 1.11 2008/08/07 06:37:20 mrg Exp $
SUBDIR= common ddc dixmods doc dri dummy i2c int10 loader modes \
os-support rac ramdac scanpci shadowfb vbe vgahw \
@ -30,9 +30,28 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/render \
-DHAVE_DIX_CONFIG_H
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX}
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
${X11FLAGS.EXTENSION}
LDADD+= ${LDADD.hw/xfree86/dix} \
LDADD+= ${LDADD.dix} \
${LDADD.fb} \
${LDADD.mi} \
${LDADD.xfixes} \
${LDADD.Xext} \
${LDADD.config} \
${LDADD.dbe} \
${LDADD.XTrap} \
${LDADD.record} \
${LDADD.render} \
${LDADD.randr} \
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.miext/shadow} \
${LDADD.Xi} \
${LDADD.xkb} \
${LDADD.composite} \
${LDADD.os} \
${LDADD.dix/xpstubs} \
${LDADD.hw/xfree86/fb} \
${LDADD.hw/xfree86/init} \
${LDADD.hw/xfree86/loader} \
@ -42,9 +61,36 @@ LDADD+= ${LDADD.hw/xfree86/dix} \
${LDADD.hw/xfree86/xf86modes} \
${LDADD.hw/xfree86/ramdac} \
${LDADD.hw/xfree86/ddc} \
${LDADD.hw/xfree86/i2c}
${LDADD.hw/xfree86/i2c} \
-lXfont \
-lfreetype \
-lXau \
-lfontenc \
${LIBCWRAPPER} \
-lpixman-1 \
-lXdmcp \
-lz \
-lm
DPADD+= ${DPADD.hw/xfree86/dix} \
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
${DPADD.mi} \
${DPADD.xfixes} \
${DPADD.Xext} \
${DPADD.config} \
${DPADD.dbe} \
${DPADD.XTrap} \
${DPADD.record} \
${DPADD.render} \
${DPADD.randr} \
${DPADD.damageext} \
${DPADD.miext/damage} \
${DPADD.miext/shadow} \
${DPADD.Xi} \
${DPADD.xkb} \
${DPADD.composite} \
${DPADD.os} \
${DPADD.dix/xpstubs} \
${DPADD.hw/xfree86/fb} \
${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/loader} \
@ -54,11 +100,15 @@ DPADD+= ${DPADD.hw/xfree86/dix} \
${DPADD.hw/xfree86/xf86modes} \
${DPADD.hw/xfree86/ramdac} \
${DPADD.hw/xfree86/ddc} \
${DPADD.hw/xfree86/i2c}
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM}
# XXX
Xorg.1: Xorg.man.pre
cp ${.ALLSRC} ${.TARGET}
#Xorg.1: Xorg.man.pre
# cp ${.ALLSRC} ${.TARGET}
MKMAN= no
.include <bsd.x11.mk>
.include <bsd.prog.mk>