Need to prefix relative directories with `${.CURDIR}/' so that

objdir builds in the src tree (i.e, without MAKEOBJDIR{,PREFIX}) work.
This commit is contained in:
lukem 2004-08-05 01:28:47 +00:00
parent 0632d7cdd0
commit b8d2105c21
25 changed files with 106 additions and 106 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.8 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -121,8 +121,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/extras/Mesa/src \
${X11FLAGS.THREADLIB} -DGLXEXT -DGLX_USE_MESA
LIBDPLIBS= Xext ../Xext \
X11 ../X11/dynamic
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@ -60,9 +60,9 @@ CPPFLAGS+= -I${GLUDIR}/include -DNDEBUG
SRCS= ${SRCS.libutil} ${SRCS.libtess} \
${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
LIBDPLIBS= Xext ../Xext \
X11 ../X11/dynamic \
GL ../GL
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic \
GL ${.CURDIR}/../GL
LDADD+= -lstdc++ -lm
DPADD+= ${LIBSTDCXX} ${LIBM}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 11:10:19 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:47 lukem Exp $
SUBDIR= X11 ICE Xau .WAIT \
SM Xext .WAIT \
@ -17,11 +17,11 @@ SUBDIR+= xlibi18n
# Cache .OBJDIRS of LIBDPLIBS commonly used in SUBDIRs.
#
LIBDPLIBS= X11 X11/dynamic \
Xext Xext \
ICE ICE \
SM SM \
Xt Xt
LIBDPLIBS= X11 ${.CURDIR}/X11/dynamic \
Xext ${.CURDIR}/Xext \
ICE ${.CURDIR}/ICE \
SM ${.CURDIR}/SM \
Xt ${.CURDIR}/Xt
libinstall::

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.14 2004/08/05 01:28:48 lukem Exp $
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
@ -99,7 +99,7 @@ CLEANFILES+= matypes.h
DPSRCS+= matypes.h
LIBDPLIBS= GL ../GL
LIBDPLIBS= GL ${.CURDIR}/../GL
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -18,7 +18,7 @@ CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t
CPPFLAGS.sm_manager.c= $(CONN_DEFINES)
CPPFLAGS.sm_genid.c= $(CONN_DEFINES)
LIBDPLIBS=ICE ../ICE
LIBDPLIBS=ICE ${.CURDIR}/../ICE
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -13,11 +13,11 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS.XEWrappers.c= -I${X11SRCDIR.xc}/lib/Xt -I${DESTDIR}${X11INCDIR}/X11
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -35,13 +35,13 @@ CPPFLAGS+= -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\"
LIBDPLIBS=\
Xmu ../Xmu \
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xpm ../Xpm \
Xext ../Xext \
X11 ../X11/dynamic
Xmu ${.CURDIR}/../Xmu \
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xpm ${.CURDIR}/../Xpm \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@ -20,12 +20,12 @@ SRCS= Actions.c AllWidgets.c AsciiSink.c AsciiSrc.c AsciiText.c \
CPPFLAGS+= -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -DOLDXAW
LIBDPLIBS=\
Xmu ../Xmu \
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xmu ${.CURDIR}/../Xmu \
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.9 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -16,9 +16,9 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
LIBDPLIBS=\
Xrender ../Xrender \
Xext ../Xext \
X11 ../X11/dynamic
Xrender ${.CURDIR}/../Xrender \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
# XXX it would be really swell if SCRIPTS was available from bsd.lib.mk
FILES= xcursor.pc xcursor-config

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -11,7 +11,7 @@ SRCS= DPMS.c MITMisc.c XAppgroup.c XEVI.c XLbx.c XMultibuf.c XSecurity.c \
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -I${X11SRCDIR.xc}/lib/X11
LIBDPLIBS=X11 ../X11/dynamic
LIBDPLIBS= X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -17,8 +17,8 @@ SRCS= XAllowDv.c XChgDCtl.c XChgFCtl.c XChgKMap.c XChgKbd.c \
CPPFLAGS+= ${X11FLAGS.THREADLIB}
LIBDPLIBS=\
Xext ../Xext \
X11 ../X11/dynamic
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -29,11 +29,11 @@ CPPFLAGS.CvtStdSel.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.LocBitmap.c= -DBITMAPDIR=\"${X11INCDIR}/X11/bitmaps\"
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -10,11 +10,11 @@ SRCS= ClientWin.c CursorName.c DefErrMsg.c GetHost.c Lower.c
CPPFLAGS+=-DHAS_SNPRINTF
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -13,9 +13,9 @@ SRCS= XpAttr.c XpContext.c XpDoc.c XpExtUtil.c XpExtVer.c \
CPPFLAGS+= ${X11FLAGS.THREADLIB}
LIBDPLIBS=\
Xau ../Xau \
Xext ../Xext \
X11 ../X11/dynamic
Xau ${.CURDIR}/../Xau \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -17,8 +17,8 @@ INCSDIR=${X11INCDIR}/X11
CPPFLAGS+=-DHAS_SNPRINTF
LIBDPLIBS=\
Xext ../Xext \
X11 ../X11/dynamic
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -16,9 +16,9 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
MAN= Xrandr.3
LIBDPLIBS=\
Xrender ../Xrender \
Xext ../Xext \
X11 ../X11/dynamic
Xrender ${.CURDIR}/../Xrender \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -16,8 +16,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
CPPFLAGS+= -I${X11SRCDIR.xc}/lib/X11
LIBDPLIBS=\
Xext ../Xext \
X11 ../X11/dynamic
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2004/08/04 08:37:04 lukem Exp $
# $NetBSD: Makefile,v 1.7 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -20,11 +20,11 @@ MLINKS= Xss.3 XScreenSaverAllocInfo.3 \
Xss.3 XScreenSaverUnsetAttributes.3
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.12 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -30,9 +30,9 @@ CPPFLAGS.Error.c= -DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \
CPPFLAGS.TMkey.c= -DXKB
LIBDPLIBS=\
X11 ../X11/dynamic \
SM ../SM \
ICE ../ICE
X11 ${.CURDIR}/../X11/dynamic \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE
.include "${NETBSDSRCDIR}/x11/tools/makestrs/Makefile.makestrs"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -10,8 +10,8 @@ SRCS= XTest.c XRecord.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
LIBDPLIBS=\
Xext ../Xext \
X11 ../X11/dynamic
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -10,8 +10,8 @@ SRCS= Xv.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
LIBDPLIBS=\
Xext ../Xext \
X11 ../X11/dynamic
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.7 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -71,11 +71,11 @@ CLEANFILES+= dpsops.h dpsops.h.tmp
.include "${NETBSDSRCDIR}/x11/tools/pswrap/Makefile.pswrap"
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -17,12 +17,12 @@ CLEANFILES+= XDPSpwraps.c XDPSpwraps.h XDPSswraps.c XDPSswraps.h
.include "${NETBSDSRCDIR}/x11/tools/pswrap/Makefile.pswrap"
LIBDPLIBS=\
Xt ../Xt \
SM ../SM \
ICE ../ICE \
dps ../dps \
Xext ../Xext \
X11 ../X11/dynamic
Xt ${.CURDIR}/../Xt \
SM ${.CURDIR}/../SM \
ICE ${.CURDIR}/../ICE \
dps ${.CURDIR}/../dps \
Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.8 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -10,7 +10,7 @@ SRCS= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcstr.c fcxml.c
LIBDPLIBS=\
expat ../../expat
expat ${.CURDIR}/../../expat
MAN= fontconfig.3

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
.include <bsd.own.mk>
@ -13,7 +13,7 @@ INCSDIR=${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
LIBDPLIBS=\
X11 ../X11/dynamic
X11 ${.CURDIR}/../X11/dynamic
.include <bsd.x11.mk>
.include <bsd.lib.mk>