Convert svn to LIBADD reduce overlinking

This commit is contained in:
Baptiste Daroussin 2014-11-25 21:43:51 +00:00
parent ee5a34ecba
commit 9c141de192
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=275079
9 changed files with 27 additions and 61 deletions

View File

@ -39,18 +39,14 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBSERFDIR} -lserf \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
-L${LIBAPRDIR} -lapr
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} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
CLEANFILES+= svnlite.1
.if(defined(ORGANIZATION) && !empty(ORGANIZATION))

View File

@ -25,15 +25,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBSVN_DELTADIR} -lsvn_delta \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lpthread
-L${LIBAPRDIR} -lapr
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -25,14 +25,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBSVN_DELTADIR} -lsvn_delta \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lpthread
-L${LIBAPRDIR} -lapr
LIBADD+= bsdxml sqlite3 z crypt pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -26,14 +26,11 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBSVN_DIFFDIR} -lsvn_diff \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lpthread
-L${LIBAPRDIR} -lapr
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -31,16 +31,12 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBSERFDIR} -lserf \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
-L${LIBAPRDIR} -lapr
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} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} \
${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR_UTIL} ${LIBAPR}
.include <bsd.prog.mk>

View File

@ -33,17 +33,13 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBSERFDIR} -lserf \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
-L${LIBAPRDIR} -lapr
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} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -30,16 +30,12 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBSERFDIR} -lserf \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
-L${LIBAPRDIR} -lapr
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} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -30,16 +30,12 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBSERFDIR} -lserf \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
-L${LIBAPRDIR} -lapr
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} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBAPR}
.include <bsd.prog.mk>

View File

@ -23,14 +23,10 @@ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \
-L${LIBSVN_DIFFDIR} -lsvn_diff \
-L${LIBSVN_SUBRDIR} -lsvn_subr \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
${LDSQLITE3} \
-lz -lcrypt -lpthread
-L${LIBAPRDIR} -lapr
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} \
${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
${LIBSERF} ${LIBAPR_UTIL}${LIBAPR}
.include <bsd.prog.mk>