fix many problems in the reachover Makefiles for X11 libraries:
- add many missing shared-library dependencies - remove many unnecessary shared-library dependencies - add many missing files to the Mesa source list - fix the ordering of the SUBDIR list in the top level to match the actual inter-library dependencies
This commit is contained in:
chs
parent
6f844bf524
commit
e211d606cd
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.12 2005/05/14 19:27:56 martin Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -128,8 +128,9 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
||||
${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION} -DGLXEXT \
|
||||
-DGLX_USE_MESA
|
||||
|
||||
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
|
||||
|
||||
@ -60,9 +60,8 @@ CPPFLAGS+= -I${GLUDIR}/include -DNDEBUG
|
||||
SRCS= ${SRCS.libutil} ${SRCS.libtess} \
|
||||
${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
|
||||
|
||||
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic \
|
||||
GL ${.CURDIR}/../GL
|
||||
LIBDPLIBS=\
|
||||
GL ${.CURDIR}/../GL
|
||||
|
||||
LDADD+= -lstdc++ -lm
|
||||
DPADD+= ${LIBSTDCXX} ${LIBM}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2004/03/06 03:05:39 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -8,6 +8,11 @@ LIB= GLw
|
||||
|
||||
SRCS= GLwDrawA.c GLwM1DrawA.c GLwM2DrawA.c GLwDAUtil.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
GL ${.CURDIR}/../GL \
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
INCS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
|
||||
INCSDIR=${X11INCDIR}/GL
|
||||
|
||||
|
||||
@ -1,13 +1,20 @@
|
||||
# $NetBSD: Makefile,v 1.9 2005/07/22 08:47:20 martin Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
SUBDIR= X11 ICE Xau .WAIT \
|
||||
SM Xext .WAIT \
|
||||
Xt Xpm Xrender GL .WAIT \
|
||||
Xmu dps .WAIT \
|
||||
FS GLU GLw OSmesa XRes XTrap Xaw Xaw6 Xcursor Xdmcp Xft Xft1 \
|
||||
Xfontcache Xi Xinerama Xmuu Xp Xrandr Xss Xtst Xv XvMC \
|
||||
Xxf86dga Xxf86misc Xxf86vm dmx dpstk expat font .WAIT \
|
||||
fontconfig fontenc freetype2 lbxutil psres oldX xkbfile xkbui xtrans
|
||||
# we encode the inter-library dependencies in the SUBDIR order:
|
||||
# each library depends on at least one library in the previous group.
|
||||
|
||||
SUBDIR=\
|
||||
X11 ICE Xau freetype2 expat FS fontenc lbxutil psres xtrans Xdmcp \
|
||||
.WAIT \
|
||||
SM Xext oldX fontconfig Xmuu Xpm \
|
||||
.WAIT \
|
||||
Xt Xrender GL Xfontcache font xkbfile XRes Xi Xinerama Xp Xss Xtst \
|
||||
Xv XvMC Xxf86dga Xxf86misc Xxf86vm dmx \
|
||||
.WAIT \
|
||||
Xmu dps XTrap GLU GLw OSmesa Xcursor Xrandr Xft Xft1 xkbui \
|
||||
.WAIT \
|
||||
Xaw Xaw6 dpstk
|
||||
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -17,11 +24,12 @@ SUBDIR+= xlibi18n
|
||||
|
||||
# Cache .OBJDIRS of LIBDPLIBS commonly used in SUBDIRs.
|
||||
#
|
||||
LIBDPLIBS= X11 ${.CURDIR}/X11/dynamic \
|
||||
Xext ${.CURDIR}/Xext \
|
||||
ICE ${.CURDIR}/ICE \
|
||||
SM ${.CURDIR}/SM \
|
||||
Xt ${.CURDIR}/Xt
|
||||
LIBDPLIBS=\
|
||||
X11 ${.CURDIR}/X11/dynamic \
|
||||
Xext ${.CURDIR}/Xext \
|
||||
ICE ${.CURDIR}/ICE \
|
||||
SM ${.CURDIR}/SM \
|
||||
Xt ${.CURDIR}/Xt
|
||||
|
||||
libinstall::
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.18 2005/05/14 19:27:56 martin Exp $
|
||||
# $NetBSD: Makefile,v 1.19 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
|
||||
|
||||
@ -6,8 +6,11 @@ NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
|
||||
|
||||
LIB= OSMesa
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/common
|
||||
SRCS+= driverfuncs.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/osmesa
|
||||
SRCS= osmesa.c
|
||||
SRCS+= osmesa.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main
|
||||
SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \
|
||||
@ -15,9 +18,10 @@ SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \
|
||||
context.c convolve.c debug.c depth.c dlist.c drawpix.c \
|
||||
enable.c enums.c eval.c extensions.c feedback.c fog.c get.c \
|
||||
hash.c hint.c histogram.c image.c imports.c light.c lines.c \
|
||||
matrix.c pixel.c points.c polygon.c rastpos.c \
|
||||
state.c stencil.c texformat.c teximage.c texobj.c \
|
||||
texstate.c texstore.c varray.c vtxfmt.c
|
||||
matrix.c occlude.c pixel.c points.c polygon.c rastpos.c \
|
||||
state.c stencil.c texcompress.c texcompress_fxt1.c texcompress_s3tc.c \
|
||||
texformat.c teximage.c texobj.c texstate.c texstore.c \
|
||||
varray.c vtxfmt.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache
|
||||
SRCS+= ac_context.c ac_import.c
|
||||
@ -26,11 +30,18 @@ SRCS+= ac_context.c ac_import.c
|
||||
SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
|
||||
m_matrix.c m_translate.c m_vector.c m_xform.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader
|
||||
SRCS+= arbprogram.c arbfragparse.c arbprogparse.c arbvertparse.c \
|
||||
bufferobj.c grammar_mesa.c \
|
||||
nvfragparse.c nvprogram.c nvvertexec.c nvvertparse.c \
|
||||
program.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast
|
||||
SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
|
||||
s_auxbuffer.c \
|
||||
s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c \
|
||||
s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
|
||||
s_depth.c s_drawpix.c s_feedback.c s_fog.c s_imaging.c \
|
||||
s_lines.c s_logic.c s_masking.c s_nvfragprog.c s_pixeltex.c \
|
||||
s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
|
||||
s_texture.c s_triangle.c s_zoom.c
|
||||
|
||||
@ -39,17 +50,16 @@ SRCS+= ss_context.c ss_triangle.c
|
||||
|
||||
.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl
|
||||
SRCS+= t_array_api.c t_array_import.c t_context.c \
|
||||
t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
|
||||
t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
|
||||
t_vb_vertex.c
|
||||
t_pipeline.c t_save_api.c t_save_loopback.c t_save_playback.c \
|
||||
t_vb_fog.c t_vb_light.c t_vb_normals.c t_vb_points.c \
|
||||
t_vb_program.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
|
||||
t_vb_vertex.c t_vertex.c t_vertex_c.c t_vtx_api.c t_vtx_eval.c \
|
||||
t_vtx_exec.c t_vtx_generic.c t_save_playback.c
|
||||
|
||||
.if ${X11DRI} != "no"
|
||||
CPPFLAGS+= ${X11FLAGS.DRI}
|
||||
.endif
|
||||
|
||||
# XXX removed in xf44 if not found to be needed remove by > xf44
|
||||
# config.c, m_debug_vertex.c, m_vertices.c, mem.c, s_pb.c, s_scissor.c
|
||||
|
||||
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${X11SRCDIR.xc}/lib/GL/include \
|
||||
-I${X11SRCDIR.xc}/extras/Mesa/include \
|
||||
@ -68,13 +78,12 @@ SRCS+= common_x86.c common_x86_asm.S x86.c x86_cliptest.S \
|
||||
3dnow.c 3dnow_normal.S 3dnow_xform1.S \
|
||||
3dnow_xform2.S 3dnow_xform3.S 3dnow_xform4.S \
|
||||
sse.c sse_normal.S sse_xform1.S \
|
||||
sse_xform2.S sse_xform3.S sse_xform4.S
|
||||
|
||||
# XXX removed in xf44 if not found to be needed remove by > xf44
|
||||
# 3dnow_vertex.S, sse_vertex.S, x86_vertex.S
|
||||
sse_xform2.S sse_xform3.S sse_xform4.S \
|
||||
t_vtx_x86.c t_vtx_x86_gcc.S
|
||||
|
||||
CPPFLAGS+= -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
|
||||
COMPILE.S= ${COMPILE.s} # XXX don't want -traditional-cpp
|
||||
AFLAGS+= -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
|
||||
AFLAGS+= -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
|
||||
.endif
|
||||
|
||||
@ -100,8 +109,11 @@ CLEANFILES+= matypes.h
|
||||
|
||||
DPSRCS+= matypes.h
|
||||
|
||||
LIBDPLIBS=\
|
||||
GL ${.CURDIR}/../GL
|
||||
|
||||
LIBDPLIBS= GL ${.CURDIR}/../GL
|
||||
LDADD+= -lm
|
||||
DPADD+= ${LIBM}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -18,7 +18,8 @@ CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t
|
||||
CPPFLAGS.sm_manager.c= $(CONN_DEFINES)
|
||||
CPPFLAGS.sm_genid.c= $(CONN_DEFINES)
|
||||
|
||||
LIBDPLIBS=ICE ${.CURDIR}/../ICE
|
||||
LIBDPLIBS=\
|
||||
ICE ${.CURDIR}/../ICE
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,6 +7,10 @@ LIB= XRes
|
||||
|
||||
SRCS= XRes.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
MAN= XRes.3
|
||||
MLINKS= XRes.3 XResQueryClientPixmapBytes.3 \
|
||||
XRes.3 XResQueryClientResources.3 \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2005/09/24 13:51:46 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -14,8 +14,6 @@ CPPFLAGS.XEWrappers.c= -I${X11SRCDIR.xc}/lib/Xt -I${DESTDIR}${X11INCDIR}/X11
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -37,8 +37,6 @@ CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\"
|
||||
LIBDPLIBS=\
|
||||
Xmu ${.CURDIR}/../Xmu \
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xpm ${.CURDIR}/../Xpm \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
NOCHECKVER= yes # we want to install an older version ...
|
||||
MKLINKLIB= no
|
||||
@ -22,8 +22,7 @@ CPPFLAGS+= -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -DOLDXAW
|
||||
LIBDPLIBS=\
|
||||
Xmu ${.CURDIR}/../Xmu \
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xpm ${.CURDIR}/../Xpm \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.10 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -17,7 +17,6 @@ CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xrender ${.CURDIR}/../Xrender \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
# XXX it would be really swell if SCRIPTS was available from bsd.lib.mk
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -11,7 +11,8 @@ SRCS= DPMS.c MITMisc.c XAppgroup.c XEVI.c XLbx.c XMultibuf.c XSecurity.c \
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/lib/X11
|
||||
|
||||
LIBDPLIBS= X11 ${.CURDIR}/../X11/dynamic
|
||||
LIBDPLIBS=\
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
# $NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
LIB= Xfontcache
|
||||
.PATH: ${X11SRCDIR.xc}/lib/${LIB}
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
SRCS= FontCache.c
|
||||
|
||||
MAN= Xfontcache.3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -12,6 +12,12 @@ SRCS= xftcolor.c xftcore.c xftdbg.c xftdpy.c xftdraw.c xftextent.c \
|
||||
INCS= Xft.h XftCompat.h
|
||||
INCSDIR=${X11INCDIR}/X11/Xft
|
||||
|
||||
LIBDPLIBS=\
|
||||
X11 ${.CURDIR}/../X11/dynamic \
|
||||
freetype ${.CURDIR}/../freetype2 \
|
||||
fontconfig ${.CURDIR}/../fontconfig/src \
|
||||
Xrender ${.CURDIR}/../Xrender
|
||||
|
||||
MAN= Xft.3
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
NOCHECKVER= yes # we want to install an older version ...
|
||||
MKLINKLIB= no
|
||||
@ -13,6 +13,12 @@ SRCS= xftcfg.c xftcolor.c xftcore.c xftdbg.c xftdir.c xftdpy.c \
|
||||
xftglyphs.c xftinit.c xftlist.c xftmatch.c xftmatrix.c \
|
||||
xftname.c xftpat.c xftrender.c xftstr.c xftxlfd.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
X11 ${.CURDIR}/../X11/dynamic \
|
||||
freetype ${.CURDIR}/../freetype2 \
|
||||
fontconfig ${.CURDIR}/../fontconfig/src \
|
||||
Xrender ${.CURDIR}/../Xrender
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,6 +7,10 @@ LIB= Xinerama
|
||||
|
||||
SRCS= Xinerama.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -30,8 +30,6 @@ CPPFLAGS.LocBitmap.c= -DBITMAPDIR=\"${X11INCDIR}/X11/bitmaps\"
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -10,10 +10,6 @@ SRCS= ClientWin.c CursorName.c DefErrMsg.c GetHost.c Lower.c
|
||||
CPPFLAGS+=-DHAS_SNPRINTF
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -17,7 +17,6 @@ INCSDIR=${X11INCDIR}/X11
|
||||
CPPFLAGS+=-DHAS_SNPRINTF
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.7 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -20,9 +20,6 @@ MLINKS= Xss.3 XScreenSaverAllocInfo.3 \
|
||||
Xss.3 XScreenSaverUnsetAttributes.3
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,6 +7,10 @@ LIB= XvMC
|
||||
|
||||
SRCS= XvMC.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,6 +7,10 @@ LIB= Xxf86dga
|
||||
|
||||
SRCS= XF86DGA.c XF86DGA2.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
MAN= XDGA.3
|
||||
MLINKS= XDGA.3 XF86DGA.3 \
|
||||
XDGA.3 XFree86-DGA.3 \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2004/01/05 02:29:30 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,5 +7,9 @@ LIB= Xxf86misc
|
||||
|
||||
SRCS= XF86Misc.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2003/10/20 05:12:41 jdolecek Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -7,5 +7,9 @@ LIB= Xxf86vm
|
||||
|
||||
SRCS= XF86VMode.c
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1 2005/03/22 04:18:48 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -10,5 +10,9 @@ SRCS= dmx.c
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/include/extensions
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.7 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -72,9 +72,6 @@ CLEANFILES+= dpsops.h dpsops.h.tmp
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -17,12 +17,11 @@ CLEANFILES+= XDPSpwraps.c XDPSpwraps.h XDPSswraps.c XDPSswraps.h
|
||||
.include "${NETBSDSRCDIR}/x11/tools/pswrap/Makefile.pswrap"
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xt ${.CURDIR}/../Xt \
|
||||
SM ${.CURDIR}/../SM \
|
||||
ICE ${.CURDIR}/../ICE \
|
||||
dps ${.CURDIR}/../dps \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
LDADD+= -lm
|
||||
DPADD+= ${LIBM}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.10 2005/03/21 14:38:48 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -168,7 +168,11 @@ SRCS= ${SRCS.bitmap} ${SRCS.fontfile} ${SRCS.fc} \
|
||||
|
||||
SUBDIR= stubs
|
||||
|
||||
LIBDPLIBS=\
|
||||
freetype ${.CURDIR}/../freetype2 \
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2003/10/20 05:02:31 jdolecek Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -12,5 +12,9 @@ SRCS= cout.c maprules.c srvmisc.c xkbatom.c xkbbells.c xkbconfig.c \
|
||||
INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
|
||||
INCSDIR=${X11INCDIR}/X11/extensions
|
||||
|
||||
LIBDPLIBS=\
|
||||
Xext ${.CURDIR}/../Xext \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2003/10/20 05:02:31 jdolecek Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -12,5 +12,12 @@ INCSDIR=${X11INCDIR}/X11/extensions
|
||||
|
||||
CPPFLAGS+=-I${X11SRCDIR.xc}/lib/xkbfile
|
||||
|
||||
LIBDPLIBS=\
|
||||
xkbfile ${.CURDIR}/../xkbfile \
|
||||
X11 ${.CURDIR}/../X11/dynamic
|
||||
|
||||
LDADD+= -lm
|
||||
DPADD+= ${LIBM}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.xlibi18n,v 1.6 2005/01/21 05:15:37 rtr Exp $
|
||||
# $NetBSD: Makefile.xlibi18n,v 1.7 2005/09/24 13:51:47 chs Exp $
|
||||
|
||||
MKLINKLIB= no
|
||||
|
||||
@ -11,7 +11,8 @@ SHLIB_MINOR= 0
|
||||
|
||||
CPPFLAGS+= ${X11FLAGS.THREADS}
|
||||
|
||||
LIBDPLIBS=X11 ${NETBSDSRCDIR}/x11/lib/X11/dynamic
|
||||
LIBDPLIBS=\
|
||||
X11 ${NETBSDSRCDIR}/x11/lib/X11/dynamic
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user