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

Change more Makefiles under usr.bin/svn to make them easier to

Browse Source 
incrementally update. No functional change intended.

MFC after:	2 weeks
X-MFC-With:	r361677
This commit is contained in:
Dimitry Andric 2020-05-31 22:40:39 +00:00
parent e82d19822e
commit 1f404a4a8e
11 changed files with 533 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,19 +6,58 @@
PROG= svn${SVNLITE}
SRCS= add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \
conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \
diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \
info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \
mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \
propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \
props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \
resolved-cmd.c revert-cmd.c \
shelve-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
SRCS= add-cmd.c \
auth-cmd.c \
blame-cmd.c \
cat-cmd.c \
changelist-cmd.c \
checkout-cmd.c \
cl-conflicts.c \
cleanup-cmd.c \
commit-cmd.c \
conflict-callbacks.c \
copy-cmd.c \
delete-cmd.c \
deprecated.c \
diff-cmd.c \
export-cmd.c \
file-merge.c \
help-cmd.c \
import-cmd.c \
info-cmd.c \
list-cmd.c \
lock-cmd.c \
log-cmd.c \
merge-cmd.c \
mergeinfo-cmd.c \
mkdir-cmd.c \
move-cmd.c \
notify.c \
patch-cmd.c \
propdel-cmd.c \
propedit-cmd.c \
propget-cmd.c \
proplist-cmd.c \
props.c \
propset-cmd.c \
relocate-cmd.c \
resolve-cmd.c \
resolved-cmd.c \
revert-cmd.c \
shelve-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:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -43,12 +82,30 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
magic \
crypto \
ssl \
pthread
DPADD= ${LIBSVN_CLIENT} \
${LIBSVN_WC} \
${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_DIFF} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
CLEANFILES+= svnlite.1

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

@ -10,7 +10,9 @@ PROG= svn${SVNLITE}admin
SRCS= svnadmin.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -27,10 +29,19 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
pthread
DPADD= ${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -8,10 +8,19 @@ MAN=
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
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:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -37,12 +46,29 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
LIBADD+= bsdxml \
sqlite3 \
z \
magic \
crypto \
ssl \
pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
DPADD= ${LIBSVN_CLIENT} \
${LIBSVN_WC} \
${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_DIFF} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -10,7 +10,9 @@ PROG= svn${SVNLITE}dumpfilter
SRCS= svndumpfilter.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -27,10 +29,20 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypt pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
crypt \
pthread
DPADD= ${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -8,9 +8,14 @@ MAN=
PROG= svn${SVNLITE}fsfs
SRCS= dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c
SRCS= dump-index-cmd.c \
load-index-cmd.c \
stats-cmd.c \
svnfsfs.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -27,10 +32,19 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
pthread
DPADD= ${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -10,7 +10,9 @@ PROG= svn${SVNLITE}look
SRCS= svnlook.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -28,10 +30,20 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
pthread
DPADD= ${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_DIFF} \
${LIBSVN_SUBR} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -10,7 +10,9 @@ PROG= svn${SVNLITE}mucc
SRCS= svnmucc.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -35,11 +37,27 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \
${LIBAPR_UTIL} ${LIBAPR}
LIBADD+= bsdxml \
sqlite3 \
z \
crypto \
ssl \
pthread
DPADD= ${LIBSVN_CLIENT} \
${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -8,9 +8,14 @@ MAN=
PROG= svn${SVNLITE}rdump
SRCS= dump_editor.c load_editor.c svnrdump.c util.c
SRCS= dump_editor.c \
load_editor.c \
svnrdump.c \
util.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -35,12 +40,29 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
crypto \
ssl \
pthread
DPADD= ${LIBSVN_CLIENT} \
${LIBSVN_WC} \
${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_DIFF} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -8,9 +8,16 @@ MAN=
PROG= svn${SVNLITE}serve
SRCS= cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c
SRCS= cyrus_auth.c \
log-escape.c \
logger.c \
serve.c \
svnserve.c \
winservice.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -32,11 +39,24 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
pthread
DPADD= ${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -8,9 +8,12 @@ MAN=
PROG= svn${SVNLITE}sync
SRCS= svnsync.c sync.c
SRCS= svnsync.c \
sync.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -32,11 +35,26 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
LIBADD+= bsdxml \
sqlite3 \
z \
crypto \
ssl \
pthread
DPADD= ${LIBSVN_RA} \
${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} \
${LIBSVN_FS} \
${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>

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

@ -10,7 +10,9 @@ PROG= svn${SVNLITE}version
SRCS= svnversion.c
CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
CFLAGS+= -I${SVNDIR}/include \
-I${SVNDIR} \
-I${.CURDIR:H} \
-I${.CURDIR:H}/lib/libapr \
-I${APR}/include/arch/unix \
-I${APR}/include \
@ -24,9 +26,18 @@ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR}
LIBADD+= bsdxml \
sqlite3 \
z \
pthread
DPADD= ${LIBSVN_WC} \
${LIBSVN_DELTA} \
${LIBSVN_DIFF} \
${LIBSVN_SUBR} \
${LIBSERF} \
${LIBAPR_UTIL} \
${LIBAPR}
.include <bsd.prog.mk>