backout and properly fix previous removal of sources. these libs are now
built more like the xorg native build
This commit is contained in:
parent
af10568256
commit
ae99eebc42
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2008/08/09 05:26:41 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2008/08/09 06:48:17 rtr Exp $
|
||||
|
||||
LIBISPRIVATE= yes
|
||||
LIB= Xext
|
||||
|
@ -7,10 +7,10 @@ LIB= Xext
|
|||
|
||||
.include "Makefile.Xextbuiltin"
|
||||
.include "Makefile.Xextmodule"
|
||||
.include "Makefile.Xext"
|
||||
|
||||
SRCS= ${SRCS.Xext} ${SRCS.Xextbuiltin} ${SRCS.Xextmodule}
|
||||
SRCS= ${SRCS.Xextbuiltin} ${SRCS.Xextmodule}
|
||||
|
||||
SUBDIR= Xextbuiltin Xextmodule
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
.include "Makefile.Xext"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.Xext,v 1.5 2008/08/09 05:26:41 rtr Exp $
|
||||
# $NetBSD: Makefile.Xext,v 1.6 2008/08/09 06:48:17 rtr Exp $
|
||||
|
||||
.PATH: ${X11SRCDIR.xorg-server}/Xext
|
||||
|
||||
|
@ -9,11 +9,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
|
|||
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
|
||||
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
|
||||
|
||||
SRCS.Xext+= EVI.c appgroup.c cup.c dpms.c panoramiX.c panoramiXSwap.c \
|
||||
panoramiXprocs.c sampleEVI.c saver.c security.c shm.c \
|
||||
fontcache.c \
|
||||
xace.c xevie.c xf86bigfont.c xres.c xvdisp.c xvmain.c xvmc.c
|
||||
|
||||
COPTS.xres.c= -Wno-error
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
@ -1,3 +1,12 @@
|
|||
# $NetBSD: Makefile.Xextbuiltin,v 1.3 2008/08/09 05:26:41 rtr Exp $
|
||||
# $NetBSD: Makefile.Xextbuiltin,v 1.4 2008/08/09 06:48:17 rtr Exp $
|
||||
|
||||
SRCS.Xextbuiltin= shape.c sleepuntil.c xtest.c
|
||||
SRCS.Xextbuiltin+= shm.c
|
||||
SRCS.Xextbuiltin+= panoramiX.c panoramiXprocs.c panoramiXSwap.c
|
||||
SRCS.Xextbuiltin+= xace.c
|
||||
SRCS.Xextbuiltin+= security.c
|
||||
#SRCS.Xextbuiltin+= xcalibrate.c
|
||||
SRCS.Xextbuiltin+= xevie.c
|
||||
#SRCS.Xextbuiltin+= xprint.c
|
||||
SRCS.Xextbuiltin+= appgroup.c
|
||||
SRCS.Xextbuiltin+= xf86bigfont.c
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
# $NetBSD: Makefile.Xextmodule,v 1.3 2008/08/09 05:26:41 rtr Exp $
|
||||
# $NetBSD: Makefile.Xextmodule,v 1.4 2008/08/09 06:48:17 rtr Exp $
|
||||
|
||||
SRCS.Xextmodule= bigreq.c mitmisc.c sync.c xcmisc.c
|
||||
|
||||
.if ${LIB} == "Xext"
|
||||
BUILDSYMLINKS= shape.c Xext-shape.c
|
||||
SRCS.Xextmodule+= Xext-shape.c
|
||||
.else
|
||||
SRCS.Xextmodule+= shape.c
|
||||
.endif
|
||||
SRCS.Xextmodule+= xvmain.c xvdisp.c xvmc.c
|
||||
SRCS.Xextmodule+= xres.c
|
||||
SRCS.Xextmodule+= saver.c
|
||||
SRCS.Xextmodule+= cup.c
|
||||
SRCS.Xextmodule+= EVI.c sampleEVI.c
|
||||
SRCS.Xextmodule+= mbuf.c
|
||||
SRCS.Xextmodule+= fontcache.c
|
||||
SRCS.Xextmodule+= dpms.c
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2008/08/09 05:26:41 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2008/08/09 06:48:17 rtr Exp $
|
||||
|
||||
LIBISPRIVATE= yes
|
||||
LIB= Xextmodule
|
||||
|
@ -6,6 +6,6 @@ LIB= Xextmodule
|
|||
.include "../../Makefile.serverlib"
|
||||
.include "../Makefile.Xextmodule"
|
||||
|
||||
SRCS= ${SRCS.Xextmodule}
|
||||
SRCS= ${SRCS.Xextmodule} shape.c ${SRCS.Xext}
|
||||
|
||||
.include "../Makefile.Xext"
|
||||
|
|
Loading…
Reference in New Issue