d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SRCTOP/OBJTOP relative paths where possible; use :H manipulation in lieu

Browse Source 
of ../ elsewhere

This simplifies pathing in make/displayed output

MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-02-12 08:36:47 +00:00
parent c10c5b1eba
commit ad68ac431b
12 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usr.bin/svn/Makefile.inc
View File

@ -12,33 +12,31 @@ PACKAGE= svn
.if !defined(SVNDIR)
SVNDIR= ${.CURDIR}/../../../contrib/subversion/subversion
APRU= ${.CURDIR}/../../../contrib/apr-util
APR= ${.CURDIR}/../../../contrib/apr
SVNDIR= ${SRCTOP}/contrib/subversion/subversion
APRU= ${SRCTOP}/contrib/apr-util
APR= ${SRCTOP}/contrib/apr
WARNS?= 0 # definitely not warns friendly
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"
.endif
.sinclude "${.CURDIR:H:H}/Makefile.inc"
LIBAPRDIR= ${.OBJDIR}/../lib/libapr
LIBAPR_UTILDIR= ${.OBJDIR}/../lib/libapr_util
LIBSERFDIR= ${.OBJDIR}/../lib/libserf
LIBAPRDIR= ${.OBJDIR:H}/lib/libapr
LIBAPR_UTILDIR= ${.OBJDIR:H}/lib/libapr_util
LIBSERFDIR= ${.OBJDIR:H}/lib/libserf
LIBSVN_CLIENTDIR= ${.OBJDIR}/../lib/libsvn_client
LIBSVN_DELTADIR= ${.OBJDIR}/../lib/libsvn_delta
LIBSVN_DIFFDIR= ${.OBJDIR}/../lib/libsvn_diff
LIBSVN_FSDIR= ${.OBJDIR}/../lib/libsvn_fs
LIBSVN_FS_FSDIR= ${.OBJDIR}/../lib/libsvn_fs_fs
LIBSVN_FS_UTILDIR= ${.OBJDIR}/../lib/libsvn_fs_util
LIBSVN_FS_XDIR= ${.OBJDIR}/../lib/libsvn_fs_x
LIBSVN_RADIR= ${.OBJDIR}/../lib/libsvn_ra
LIBSVN_RA_LOCALDIR= ${.OBJDIR}/../lib/libsvn_ra_local
LIBSVN_RA_SVNDIR= ${.OBJDIR}/../lib/libsvn_ra_svn
LIBSVN_RA_SERFDIR= ${.OBJDIR}/../lib/libsvn_ra_serf
LIBSVN_REPOSDIR= ${.OBJDIR}/../lib/libsvn_repos
LIBSVN_SUBRDIR= ${.OBJDIR}/../lib/libsvn_subr
LIBSVN_WCDIR= ${.OBJDIR}/../lib/libsvn_wc
LIBSVN_CLIENTDIR= ${.OBJDIR:H}/lib/libsvn_client
LIBSVN_DELTADIR= ${.OBJDIR:H}/lib/libsvn_delta
LIBSVN_DIFFDIR= ${.OBJDIR:H}/lib/libsvn_diff
LIBSVN_FSDIR= ${.OBJDIR:H}/lib/libsvn_fs
LIBSVN_FS_FSDIR= ${.OBJDIR:H}/lib/libsvn_fs_fs
LIBSVN_FS_UTILDIR= ${.OBJDIR:H}/lib/libsvn_fs_util
LIBSVN_FS_XDIR= ${.OBJDIR:H}/lib/libsvn_fs_x
LIBSVN_RADIR= ${.OBJDIR:H}/lib/libsvn_ra
LIBSVN_RA_LOCALDIR= ${.OBJDIR:H}/lib/libsvn_ra_local
LIBSVN_RA_SVNDIR= ${.OBJDIR:H}/lib/libsvn_ra_svn
LIBSVN_RA_SERFDIR= ${.OBJDIR:H}/lib/libsvn_ra_serf
LIBSVN_REPOSDIR= ${.OBJDIR:H}/lib/libsvn_repos
LIBSVN_SUBRDIR= ${.OBJDIR:H}/lib/libsvn_subr
LIBSVN_WCDIR= ${.OBJDIR:H}/lib/libsvn_wc
LIBAPR= ${LIBAPRDIR}/libapr.a
LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a

8
usr.bin/svn/svn/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svn
@ -17,11 +17,11 @@ SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
resolved-cmd.c revert-cmd.c status-cmd.c similarity.c status.c \
svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnadmin/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnadmin
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}admin
SRCS= svnadmin.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnbench/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnbench
@ -11,11 +11,11 @@ PROG= svn${SVNLITE}bench
SRCS= help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \
null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svndumpfilter/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svndumpfilter
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}dumpfilter
SRCS= svndumpfilter.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnfsfs/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnfsfs
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}fsfs
SRCS= dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnlook/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnlook
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}look
SRCS= svnlook.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnmucc/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnmucc
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}mucc
SRCS= svnmucc.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnrdump/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnrdump
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}rdump
SRCS= dump_editor.c load_editor.c svnrdump.c util.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnserve/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnserve
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}serve
SRCS= cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnsync/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnsync
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}sync
SRCS= svnsync.c sync.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include

8
usr.bin/svn/svnversion/Makefile
View File

@ -2,7 +2,7 @@
MAN=
.include "${.CURDIR}/../Makefile.inc"
.include "${.CURDIR:H}/Makefile.inc"
.PATH: ${SVNDIR}/svnversion
@ -10,11 +10,11 @@ PROG= svn${SVNLITE}version
SRCS= svnversion.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../lib/libapr \
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
-I${.CURDIR}/../lib/libapr_util \
-I${.CURDIR:H}/lib/libapr_util \
-I${APRU}/include/private \
-I${APRU}/include