Author: bapt
Date: Tue Nov 25 21:43:51 2014
New Revision: 275079
URL: https://svnweb.freebsd.org/changeset/base/275079
Log:
Convert svn to LIBADD reduce overlinking
Modified:
head/usr.bin/svn/svn/Makefile
head/usr.bin/svn/svnadmin/Makefile
head/usr.bin/svn/svndumpfilter/Makefile
head/usr.bin/svn/svnlook/Makefile
head/usr.bin/svn/svnmucc/Makefile
head/usr.bin/svn/svnrdump/Makefile
head/usr.bin/svn/svnserve/Makefile
head/usr.bin/svn/svnsync/Makefile
head/usr.bin/svn/svnversion/Makefile
Modified: head/usr.bin/svn/svn/Makefile
==============================================================================
--- head/usr.bin/svn/svn/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svn/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -39,18 +39,14 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien
-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))
Modified: head/usr.bin/svn/svnadmin/Makefile
==============================================================================
--- head/usr.bin/svn/svnadmin/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnadmin/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
Modified: head/usr.bin/svn/svndumpfilter/Makefile
==============================================================================
--- head/usr.bin/svn/svndumpfilter/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svndumpfilter/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
Modified: head/usr.bin/svn/svnlook/Makefile
==============================================================================
--- head/usr.bin/svn/svnlook/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnlook/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
Modified: head/usr.bin/svn/svnmucc/Makefile
==============================================================================
--- head/usr.bin/svn/svnmucc/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnmucc/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -31,16 +31,12 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien
-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>
Modified: head/usr.bin/svn/svnrdump/Makefile
==============================================================================
--- head/usr.bin/svn/svnrdump/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnrdump/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -33,17 +33,13 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien
-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>
Modified: head/usr.bin/svn/svnserve/Makefile
==============================================================================
--- head/usr.bin/svn/svnserve/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnserve/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
Modified: head/usr.bin/svn/svnsync/Makefile
==============================================================================
--- head/usr.bin/svn/svnsync/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnsync/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
Modified: head/usr.bin/svn/svnversion/Makefile
==============================================================================
--- head/usr.bin/svn/svnversion/Makefile Tue Nov 25 21:43:01 2014
(r275078)
+++ head/usr.bin/svn/svnversion/Makefile Tue Nov 25 21:43:51 2014
(r275079)
@@ -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>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
