Sat Jul 18 15:24:31 2020 UTC ()
No need to link miext/libshadow.a.


(tsutsui)
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile 2016/06/10 03:42:14 1.1.1.1
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile 2020/07/18 15:24:31 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= X68k 5PROG= X68k
6BINMODE= 4711 6BINMODE= 4711
7 7
8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X 8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X
9 9
10FILES= X68kConfig 10FILES= X68kConfig
11FILESDIR= ${X11ETCDIR} 11FILESDIR= ${X11ETCDIR}
12 12
13.include "../../../Makefile.serverlib" 13.include "../../../Makefile.serverlib"
14.include "../../../Makefile.servermod" 14.include "../../../Makefile.servermod"
@@ -48,47 +48,45 @@ CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"$ @@ -48,47 +48,45 @@ CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"$
48LDADD+= ${LDADD.dix} \ 48LDADD+= ${LDADD.dix} \
49 ${LDADD.fb} \ 49 ${LDADD.fb} \
50 ${LDADD.mi} \ 50 ${LDADD.mi} \
51 ${LDADD.xkb} \ 51 ${LDADD.xkb} \
52 ${LDADD.xkbstubs} \ 52 ${LDADD.xkbstubs} \
53 ${LDADD.randr} \ 53 ${LDADD.randr} \
54 ${LDADD.Xext} \ 54 ${LDADD.Xext} \
55 ${LDADD.composite} \ 55 ${LDADD.composite} \
56 ${LDADD.render} \ 56 ${LDADD.render} \
57 ${LDADD.os} \ 57 ${LDADD.os} \
58 ${LDADD.xfixes} \ 58 ${LDADD.xfixes} \
59 ${LDADD.damageext} \ 59 ${LDADD.damageext} \
60 ${LDADD.miext/damage} \ 60 ${LDADD.miext/damage} \
61 ${LDADD.miext/shadow} \ 
62 ${LDADD.miext/sync} \ 61 ${LDADD.miext/sync} \
63 ${LDADD.Xi} \ 62 ${LDADD.Xi} \
64 -lXfont \ 63 -lXfont \
65 -lpixman-1 \ 64 -lpixman-1 \
66 -lXext \ 65 -lXext \
67 -lX11 \ 66 -lX11 \
68 -lz \ 67 -lz \
69 -lm 68 -lm
70 69
71DPADD+= ${LDADD.dix} \ 70DPADD+= ${LDADD.dix} \
72 ${DPADD.fb} \ 71 ${DPADD.fb} \
73 ${DPADD.mi} \ 72 ${DPADD.mi} \
74 ${DPADD.xkb} \ 73 ${DPADD.xkb} \
75 ${DPADD.randr} \ 74 ${DPADD.randr} \
76 ${DPADD.Xext} \ 75 ${DPADD.Xext} \
77 ${DPADD.composite} \ 76 ${DPADD.composite} \
78 ${DPADD.render} \ 77 ${DPADD.render} \
79 ${DPADD.os} \ 78 ${DPADD.os} \
80 ${DPADD.xfixes} \ 79 ${DPADD.xfixes} \
81 ${DPADD.damageext} \ 80 ${DPADD.damageext} \
82 ${DPADD.miext/damage} \ 81 ${DPADD.miext/damage} \
83 ${DPADD.miext/shadow} \ 
84 ${DPADD.miext/sync} \ 82 ${DPADD.miext/sync} \
85 ${DPADD.Xi} \ 83 ${DPADD.Xi} \
86 ${LIBXFONT} \ 84 ${LIBXFONT} \
87 ${LIBPIXMAN-1} \ 85 ${LIBPIXMAN-1} \
88 ${LIBXEXT} \ 86 ${LIBXEXT} \
89 ${LIBX11} \ 87 ${LIBX11} \
90 ${LIBZ} \ 88 ${LIBZ} \
91 ${LIBM} 89 ${LIBM}
92 90
93.include <bsd.x11.mk> 91.include <bsd.x11.mk>
94.include <bsd.prog.mk> 92.include <bsd.prog.mk>