Author: dim Date: Sun May 31 22:04:51 2020 New Revision: 361677 URL: https://svnweb.freebsd.org/changeset/base/361677
Log: Change Makefiles under usr.bin/svn to make them easier to incrementally update. No functional change intended. MFC after: 2 weeks Modified: head/usr.bin/svn/Makefile head/usr.bin/svn/lib/Makefile head/usr.bin/svn/lib/libapr/Makefile head/usr.bin/svn/lib/libapr_util/Makefile head/usr.bin/svn/lib/libserf/Makefile head/usr.bin/svn/lib/libsvn_client/Makefile head/usr.bin/svn/lib/libsvn_delta/Makefile head/usr.bin/svn/lib/libsvn_diff/Makefile head/usr.bin/svn/lib/libsvn_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_fs/Makefile head/usr.bin/svn/lib/libsvn_fs_util/Makefile head/usr.bin/svn/lib/libsvn_fs_x/Makefile head/usr.bin/svn/lib/libsvn_ra/Makefile head/usr.bin/svn/lib/libsvn_ra_local/Makefile head/usr.bin/svn/lib/libsvn_ra_serf/Makefile head/usr.bin/svn/lib/libsvn_ra_svn/Makefile head/usr.bin/svn/lib/libsvn_repos/Makefile head/usr.bin/svn/lib/libsvn_subr/Makefile head/usr.bin/svn/lib/libsvn_wc/Makefile Modified: head/usr.bin/svn/Makefile ============================================================================== --- head/usr.bin/svn/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -1,8 +1,18 @@ # $FreeBSD$ -SUBDIR= lib .WAIT \ - svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \ - svnsync svnversion svnmucc svnrdump +SUBDIR= lib \ + .WAIT \ + svn \ + svnadmin \ + svnbench \ + svndumpfilter \ + svnfsfs \ + svnlook \ + svnserve \ + svnsync \ + svnversion \ + svnmucc \ + svnrdump SUBDIR_PARALLEL= .include <bsd.subdir.mk> Modified: head/usr.bin/svn/lib/Makefile ============================================================================== --- head/usr.bin/svn/lib/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -1,9 +1,22 @@ # $FreeBSD$ -SUBDIR= libapr libapr_util libserf \ - libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \ - libsvn_fs_util libsvn_fs_x libsvn_ra libsvn_ra_local libsvn_ra_serf \ - libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc +SUBDIR= libapr \ + libapr_util \ + libserf \ + libsvn_client \ + libsvn_delta \ + libsvn_diff \ + libsvn_fs \ + libsvn_fs_fs \ + libsvn_fs_util \ + libsvn_fs_x \ + libsvn_ra \ + libsvn_ra_local \ + libsvn_ra_serf \ + libsvn_ra_svn \ + libsvn_repos \ + libsvn_subr \ + libsvn_wc SUBDIR_PARALLEL= .include <bsd.subdir.mk> Modified: head/usr.bin/svn/lib/libapr/Makefile ============================================================================== --- head/usr.bin/svn/lib/libapr/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libapr/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -4,31 +4,109 @@ INTERNALLIB= yes LIB= apr -SRCS= apr_cpystrn.c apr_fnmatch.c apr_getpass.c apr_hash.c apr_skiplist.c \ - apr_pools.c apr_random.c apr_snprintf.c apr_strings.c \ - apr_strnatcmp.c apr_strtok.c apr_tables.c buffer.c \ - builtins.c charset.c common.c copy.c dir.c dso.c env.c \ - epoll.c errorcodes.c fileacc.c filedup.c filepath.c \ - filepath_util.c filestat.c flock.c fullrw.c getopt.c \ - global_mutex.c groupinfo.c ia32.c inet_ntop.c inet_pton.c \ - kqueue.c mktemp.c mmap.c multicast.c mutex.c open.c \ - otherchild.c pipe.c poll.c pollcb.c pollset.c port.c \ - ppc.c proc.c proc_mutex.c procsup.c rand.c readwrite.c \ - s390.c seek.c select.c sendrecv.c sha2.c sha2_glue.c \ - shm.c signals.c sockaddr.c socket_util.c sockets.c \ - sockopt.c solaris.c start.c tempdir.c thread.c thread_cond.c \ - thread_mutex.c thread_rwlock.c threadpriv.c time.c \ - timestr.c userinfo.c version.c waitio.c z_asio.c +SRCS= apr_cpystrn.c \ + apr_fnmatch.c \ + apr_getpass.c \ + apr_hash.c \ + apr_pools.c \ + apr_random.c \ + apr_skiplist.c \ + apr_snprintf.c \ + apr_strings.c \ + apr_strnatcmp.c \ + apr_strtok.c \ + apr_tables.c \ + buffer.c \ + builtins.c \ + charset.c \ + common.c \ + copy.c \ + dir.c \ + dso.c \ + env.c \ + epoll.c \ + errorcodes.c \ + fileacc.c \ + filedup.c \ + filepath.c \ + filepath_util.c \ + filestat.c \ + flock.c \ + fullrw.c \ + getopt.c \ + global_mutex.c \ + groupinfo.c \ + ia32.c \ + inet_ntop.c \ + inet_pton.c \ + kqueue.c \ + mktemp.c \ + mmap.c \ + multicast.c \ + mutex.c \ + open.c \ + otherchild.c \ + pipe.c \ + poll.c \ + pollcb.c \ + pollset.c \ + port.c \ + ppc.c \ + proc.c \ + proc_mutex.c \ + procsup.c \ + rand.c \ + readwrite.c \ + s390.c \ + seek.c \ + select.c \ + sendrecv.c \ + sha2.c \ + sha2_glue.c \ + shm.c \ + signals.c \ + sockaddr.c \ + socket_util.c \ + sockets.c \ + sockopt.c \ + solaris.c \ + start.c \ + tempdir.c \ + thread.c \ + thread_cond.c \ + thread_mutex.c \ + thread_rwlock.c \ + threadpriv.c \ + time.c \ + timestr.c \ + userinfo.c \ + version.c \ + waitio.c \ + z_asio.c -.PATH: ${APR}/atomic/unix ${APR}/dso/unix ${APR}/file_io/unix \ - ${APR}/locks/unix ${APR}/memory/unix ${APR}/misc/unix \ - ${APR}/mmap/unix ${APR}/network_io/unix ${APR}/passwd \ - ${APR}/poll/unix ${APR}/random/unix ${APR}/shmem/unix \ - ${APR}/strings ${APR}/support/unix ${APR}/tables \ - ${APR}/threadproc/unix ${APR}/time/unix ${APR}/user/unix \ +.PATH: ${APR}/atomic/unix \ + ${APR}/dso/unix \ + ${APR}/file_io/unix \ + ${APR}/locks/unix \ + ${APR}/memory/unix \ + ${APR}/misc/unix \ + ${APR}/mmap/unix \ + ${APR}/network_io/unix \ + ${APR}/passwd \ + ${APR}/poll/unix \ + ${APR}/random/unix \ + ${APR}/shmem/unix \ + ${APR}/strings \ + ${APR}/support/unix \ + ${APR}/tables \ + ${APR}/threadproc/unix \ + ${APR}/time/unix \ + ${APR}/user/unix \ ${APR}/include -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \ - -I${APR}/include/arch/unix -I${APR}/include +CFLAGS+= -DHAVE_CONFIG_H \ + -I${.CURDIR} \ + -I${APR}/include/arch/unix \ + -I${APR}/include .include <bsd.lib.mk> Modified: head/usr.bin/svn/lib/libapr_util/Makefile ============================================================================== --- head/usr.bin/svn/lib/libapr_util/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libapr_util/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -5,22 +5,57 @@ INTERNALLIB= yes LIB= apr-util -SRCS= apr_base64.c apr_brigade.c apr_buckets.c apr_buckets_alloc.c \ - apr_buckets_eos.c apr_buckets_file.c apr_buckets_flush.c \ - apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c \ - apr_buckets_pool.c apr_buckets_refcount.c apr_buckets_simple.c \ - apr_buckets_socket.c apr_crypto.c apr_date.c apr_dbd.c \ - apr_hooks.c apr_md4.c apr_md5.c apr_memcache.c apr_passwd.c \ - apr_queue.c apr_reslist.c apr_rmm.c apr_sha1.c apr_strmatch.c \ - apr_thread_pool.c apr_uri.c apr_xml.c apu_dso.c apu_version.c \ - crypt_blowfish.c getuuid.c uuid.c xlate.c +SRCS= apr_base64.c \ + apr_brigade.c \ + apr_buckets.c \ + apr_buckets_alloc.c \ + apr_buckets_eos.c \ + apr_buckets_file.c \ + apr_buckets_flush.c \ + apr_buckets_heap.c \ + apr_buckets_mmap.c \ + apr_buckets_pipe.c \ + apr_buckets_pool.c \ + apr_buckets_refcount.c \ + apr_buckets_simple.c \ + apr_buckets_socket.c \ + apr_crypto.c \ + apr_date.c \ + apr_dbd.c \ + apr_hooks.c \ + apr_md4.c \ + apr_md5.c \ + apr_memcache.c \ + apr_passwd.c \ + apr_queue.c \ + apr_reslist.c \ + apr_rmm.c \ + apr_sha1.c \ + apr_strmatch.c \ + apr_thread_pool.c \ + apr_uri.c \ + apr_xml.c \ + apu_dso.c \ + apu_version.c \ + crypt_blowfish.c \ + getuuid.c \ + uuid.c \ + xlate.c -.PATH: ${APRU}/buckets ${APRU}/crypto ${APRU}/dbd \ - ${APRU}/encoding ${APRU}/hooks \ - ${APRU}/memcache ${APRU}/misc ${APRU}/strmatch \ - ${APRU}/uri ${APRU}/xlate ${APRU}/xml ${APRU}/include +.PATH: ${APRU}/buckets \ + ${APRU}/crypto \ + ${APRU}/dbd \ + ${APRU}/encoding \ + ${APRU}/hooks \ + ${APRU}/memcache \ + ${APRU}/misc \ + ${APRU}/strmatch \ + ${APRU}/uri \ + ${APRU}/xlate \ + ${APRU}/xml \ + ${APRU}/include -CFLAGS+= -DHAVE_CONFIG_H \ +CFLAGS+= -DHAVE_CONFIG_H \ -I${.CURDIR} \ -I${APRU}/include/private \ -I${APRU}/include \ @@ -31,8 +66,8 @@ CFLAGS+= -DHAVE_CONFIG_H \ .include <src.opts.mk> .if ${MK_ICONV} == "yes" -CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1 +CFLAGS+= -DHAVE_ICONV_H=1 \ + -DAPU_HAVE_ICONV=1 .endif .include <bsd.lib.mk> - Modified: head/usr.bin/svn/lib/libserf/Makefile ============================================================================== --- head/usr.bin/svn/lib/libserf/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libserf/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -5,20 +5,44 @@ INTERNALLIB= yes LIB= serf -SRCS= aggregate_buckets.c allocator.c auth.c auth_basic.c \ - auth_digest.c auth_spnego.c auth_spnego_gss.c barrier_buckets.c \ - buckets.c bwtp_buckets.c chunk_buckets.c context.c \ - dechunk_buckets.c deflate_buckets.c file_buckets.c \ - headers_buckets.c incoming.c iovec_buckets.c limit_buckets.c \ - mmap_buckets.c outgoing.c request_buckets.c \ - response_body_buckets.c response_buckets.c simple_buckets.c \ - socket_buckets.c ssl_buckets.c ssltunnel.c +SRCS= aggregate_buckets.c \ + allocator.c \ + auth.c \ + auth_basic.c \ + auth_digest.c \ + auth_spnego.c \ + auth_spnego_gss.c \ + barrier_buckets.c \ + buckets.c \ + bwtp_buckets.c \ + chunk_buckets.c \ + context.c \ + dechunk_buckets.c \ + deflate_buckets.c \ + file_buckets.c \ + headers_buckets.c \ + incoming.c \ + iovec_buckets.c \ + limit_buckets.c \ + mmap_buckets.c \ + outgoing.c \ + request_buckets.c \ + response_body_buckets.c \ + response_buckets.c \ + simple_buckets.c \ + socket_buckets.c \ + ssl_buckets.c \ + ssltunnel.c -.PATH: ${SERF}/buckets ${SERF}/auth ${SERF} +.PATH: ${SERF}/buckets \ + ${SERF}/auth \ + ${SERF} -CFLAGS+= -I${.CURDIR} -I${SERF} \ +CFLAGS+= -I${.CURDIR} \ + -I${SERF} \ -I${.CURDIR}/../libapr \ - -I${APR}/include/arch/unix -I${APR}/include \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ -I${.CURDIR}/../libapr_util \ -I${APRU}/include Modified: head/usr.bin/svn/lib/libsvn_client/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_client/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_client/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,17 +7,57 @@ INTERNALLIB= yes LIB= svn_client -SRCS= add.c blame.c cat.c changelist.c checkout.c cleanup.c \ - cmdline.c commit_util.c commit.c compat_providers.c \ - conflicts.c copy_foreign.c copy.c ctx.c delete.c deprecated.c \ - diff_local.c diff_summarize.c diff.c export.c externals.c \ - import.c info.c iprops.c list.c locking_commands.c log.c \ - merge_elements.c merge.c mergeinfo.c mtcc.c patch.c \ - prop_commands.c ra.c relocate.c repos_diff.c resolved.c \ - revert.c revisions.c shelve.c status.c switch.c update.c \ - upgrade.c url.c util.c version.c +SRCS= add.c \ + blame.c \ + cat.c \ + changelist.c \ + checkout.c \ + cleanup.c \ + cmdline.c \ + commit.c \ + commit_util.c \ + compat_providers.c \ + conflicts.c \ + copy.c \ + copy_foreign.c \ + ctx.c \ + delete.c \ + deprecated.c \ + diff.c \ + diff_local.c \ + diff_summarize.c \ + export.c \ + externals.c \ + import.c \ + info.c \ + iprops.c \ + list.c \ + locking_commands.c \ + log.c \ + merge.c \ + merge_elements.c \ + mergeinfo.c \ + mtcc.c \ + patch.c \ + prop_commands.c \ + ra.c \ + relocate.c \ + repos_diff.c \ + resolved.c \ + revert.c \ + revisions.c \ + shelve.c \ + status.c \ + switch.c \ + update.c \ + upgrade.c \ + url.c \ + util.c \ + version.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_delta/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_delta/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_delta/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,29 @@ INTERNALLIB= yes LIB= svn_delta -SRCS= branch.c branch_compat.c branch_migrate.c branch_nested.c \ - branch_repos.c cancel.c compat.c compose_delta.c \ - debug_editor.c default_editor.c deprecated.c \ - depth_filter_editor.c editor.c element.c \ - path_driver.c svndiff.c text_delta.c version.c xdelta.c +SRCS= branch.c \ + branch_compat.c \ + branch_migrate.c \ + branch_nested.c \ + branch_repos.c \ + cancel.c \ + compat.c \ + compose_delta.c \ + debug_editor.c \ + default_editor.c \ + deprecated.c \ + depth_filter_editor.c \ + editor.c \ + element.c \ + path_driver.c \ + svndiff.c \ + text_delta.c \ + version.c \ + xdelta.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_diff/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_diff/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_diff/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,11 +7,22 @@ INTERNALLIB= yes LIB= svn_diff -SRCS= binary_diff.c deprecated.c diff.c diff3.c diff4.c \ - diff_file.c diff_memory.c diff_tree.c lcs.c parse-diff.c \ - token.c util.c +SRCS= binary_diff.c \ + deprecated.c \ + diff.c \ + diff3.c \ + diff4.c \ + diff_file.c \ + diff_memory.c \ + diff_tree.c \ + lcs.c \ + parse-diff.c \ + token.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -20,4 +31,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/ -I${APRU}/include .include <bsd.lib.mk> - Modified: head/usr.bin/svn/lib/libsvn_fs/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,9 +7,14 @@ INTERNALLIB= yes LIB= svn_fs -SRCS= access.c deprecated.c editor.c fs-loader.c +SRCS= access.c \ + deprecated.c \ + editor.c \ + fs-loader.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_fs/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_fs/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_fs/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,33 @@ INTERNALLIB= yes LIB= svn_fs_fs -SRCS= cached_data.c caching.c dag.c dump-index.c fs.c fs_fs.c \ - hotcopy.c id.c index.c load-index.c lock.c low_level.c \ - pack.c recovery.c rep-cache.c rev_file.c revprops.c \ - stats.c temp_serializer.c transaction.c tree.c util.c \ +SRCS= cached_data.c \ + caching.c \ + dag.c \ + dump-index.c \ + fs.c \ + fs_fs.c \ + hotcopy.c \ + id.c \ + index.c \ + load-index.c \ + lock.c \ + low_level.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + rev_file.c \ + revprops.c \ + stats.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_util/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_util/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_util/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -9,7 +9,9 @@ LIB= svn_fs_util SRCS= fs-util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_fs_x/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_fs_x/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_fs_x/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,14 +7,37 @@ INTERNALLIB= yes LIB= svn_fs_x -SRCS= batch_fsync.c cached_data.c caching.c changes.c \ - dag_cache.c dag.c fs.c fs_id.c fs_x.c \ - hotcopy.c id.c index.c lock.c low_level.c noderevs.c pack.c \ - recovery.c rep-cache.c reps.c rev_file.c revprops.c \ - string_table.c temp_serializer.c transaction.c tree.c \ - util.c verify.c +SRCS= batch_fsync.c \ + cached_data.c \ + caching.c \ + changes.c \ + dag.c \ + dag_cache.c \ + fs.c \ + fs_id.c \ + fs_x.c \ + hotcopy.c \ + id.c \ + index.c \ + lock.c \ + low_level.c \ + noderevs.c \ + pack.c \ + recovery.c \ + rep-cache.c \ + reps.c \ + rev_file.c \ + revprops.c \ + string_table.c \ + temp_serializer.c \ + transaction.c \ + tree.c \ + util.c \ + verify.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,10 +7,16 @@ INTERNALLIB= yes LIB= svn_ra -SRCS= compat.c debug_reporter.c deprecated.c editor.c \ - ra_loader.c util.c +SRCS= compat.c \ + debug_reporter.c \ + deprecated.c \ + editor.c \ + ra_loader.c \ + util.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_local/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_local/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_local/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,9 +7,12 @@ INTERNALLIB= yes LIB= svn_ra_local -SRCS= ra_plugin.c split_url.c +SRCS= ra_plugin.c \ + split_url.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_serf/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_serf/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_serf/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,15 +7,40 @@ INTERNALLIB= yes LIB= svn_ra_serf -SRCS= blame.c blncache.c commit.c eagain_bucket.c \ - get_deleted_rev.c get_file.c get_lock.c getdate.c \ - getlocations.c getlocationsegments.c getlocks.c \ - inherited_props.c list.c lock.c log.c merge.c mergeinfo.c \ - multistatus.c options.c property.c replay.c \ - request_body.c sb_bucket.c serf.c stat.c stream_bucket.c \ - update.c util.c util_error.c xml.c +SRCS= blame.c \ + blncache.c \ + commit.c \ + eagain_bucket.c \ + get_deleted_rev.c \ + get_file.c \ + get_lock.c \ + getdate.c \ + getlocations.c \ + getlocationsegments.c \ + getlocks.c \ + inherited_props.c \ + list.c \ + lock.c \ + log.c \ + merge.c \ + mergeinfo.c \ + multistatus.c \ + options.c \ + property.c \ + replay.c \ + request_body.c \ + sb_bucket.c \ + serf.c \ + stat.c \ + stream_bucket.c \ + update.c \ + util.c \ + util_error.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_ra_svn/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_ra_svn/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_ra_svn/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,10 +7,20 @@ INTERNALLIB= yes LIB= svn_ra_svn -SRCS= client.c cram.c cyrus_auth.c deprecated.c editorp.c \ - internal_auth.c marshal.c streams.c wrapped_sasl.c version.c +SRCS= client.c \ + cram.c \ + cyrus_auth.c \ + deprecated.c \ + editorp.c \ + internal_auth.c \ + marshal.c \ + streams.c \ + version.c \ + wrapped_sasl.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_repos/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_repos/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_repos/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,13 +7,32 @@ INTERNALLIB= yes LIB= svn_repos -SRCS= authz.c authz_info.c authz_parse.c \ - config_pool.c commit.c compat.c config_file.c delta.c \ - deprecated.c dump.c fs-wrap.c hooks.c load-fs-vtable.c \ - list.c load.c log.c node_tree.c notify.c replay.c reporter.c \ - repos.c rev_hunt.c +SRCS= authz.c \ + authz_info.c \ + authz_parse.c \ + commit.c \ + compat.c \ + config_file.c \ + config_pool.c \ + delta.c \ + deprecated.c \ + dump.c \ + fs-wrap.c \ + hooks.c \ + list.c \ + load-fs-vtable.c \ + load.c \ + log.c \ + node_tree.c \ + notify.c \ + replay.c \ + reporter.c \ + repos.c \ + rev_hunt.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ Modified: head/usr.bin/svn/lib/libsvn_subr/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_subr/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_subr/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,29 +7,96 @@ INTERNALLIB= yes LIB= svn_subr -SRCS= adler32.c atomic.c auth.c base64.c bit_array.c \ - cache-inprocess.c cache-membuffer.c cache-memcache.c \ - cache.c cache-null.c cache_config.c checksum.c cmdline.c \ - compat.c compress_lz4.c compress_zlib.c \ - config.c config_auth.c config_file.c \ - config_win.c crypto.c ctype.c date.c debug.c \ - deprecated.c dirent_uri.c dso.c \ - encode.c eol.c error.c fnv1a.c \ - gpg_agent.c hash.c io.c iter.c lock.c log.c lz4.c \ - macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \ - object_pool.c opt.c packed_data.c path.c \ - pool.c prefix_string.c prompt.c properties.c quoprint.c \ - root_pools.c simple_providers.c skel.c sorts.c spillbuf.c \ - sqlite.c sqlite3wrapper.c ssl_client_cert_providers.c \ - ssl_client_cert_pw_providers.c ssl_server_trust_providers.c \ - stream.c string.c subst.c sysinfo.c target.c \ - temp_serializer.c time.c token.c types.c user.c \ - username_providers.c utf.c utf8proc.c \ - utf_validate.c utf_width.c validate.c version.c \ - win32_crashrpt.c win32_crypto.c win32_xlate.c \ - x509info.c x509parse.c xml.c +SRCS= adler32.c \ + atomic.c \ + auth.c \ + base64.c \ + bit_array.c \ + cache-inprocess.c \ + cache-membuffer.c \ + cache-memcache.c \ + cache-null.c \ + cache.c \ + cache_config.c \ + checksum.c \ + cmdline.c \ + compat.c \ + compress_lz4.c \ + compress_zlib.c \ + config.c \ + config_auth.c \ + config_file.c \ + config_win.c \ + crypto.c \ + ctype.c \ + date.c \ + debug.c \ + deprecated.c \ + dirent_uri.c \ + dso.c \ + encode.c \ + eol.c \ + error.c \ + fnv1a.c \ + gpg_agent.c \ + hash.c \ + io.c \ + iter.c \ + lock.c \ + log.c \ + lz4.c \ + macos_keychain.c \ + magic.c \ + md5.c \ + mergeinfo.c \ + mutex.c \ + nls.c \ + object_pool.c \ + opt.c \ + packed_data.c \ + path.c \ + pool.c \ + prefix_string.c \ + prompt.c \ + properties.c \ + quoprint.c \ + root_pools.c \ + simple_providers.c \ + skel.c \ + sorts.c \ + spillbuf.c \ + sqlite.c \ + sqlite3wrapper.c \ + ssl_client_cert_providers.c \ + ssl_client_cert_pw_providers.c \ + ssl_server_trust_providers.c \ + stream.c \ + string.c \ + subst.c \ + sysinfo.c \ + target.c \ + temp_serializer.c \ + time.c \ + token.c \ + types.c \ + user.c \ + username_providers.c \ + utf.c \ + utf8proc.c \ + utf_validate.c \ + utf_width.c \ + validate.c \ + version.c \ + win32_crashrpt.c \ + win32_crypto.c \ + win32_xlate.c \ + x509info.c \ + x509parse.c \ + xml.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ @@ -39,4 +106,3 @@ CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/ -I${SQLITE} .include <bsd.lib.mk> - Modified: head/usr.bin/svn/lib/libsvn_wc/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsvn_wc/Makefile Sun May 31 21:56:07 2020 (r361676) +++ head/usr.bin/svn/lib/libsvn_wc/Makefile Sun May 31 22:04:51 2020 (r361677) @@ -7,17 +7,48 @@ INTERNALLIB= yes LIB= svn_wc -SRCS= adm_crawler.c adm_files.c adm_ops.c \ - ambient_depth_filter_editor.c cleanup.c conflicts.c \ - context.c copy.c crop.c delete.c deprecated.c diff_editor.c \ - diff_local.c entries.c externals.c info.c lock.c merge.c \ - node.c old-and-busted.c props.c questions.c relocate.c \ - revert.c revision_status.c status.c translate.c \ - tree_conflicts.c update_editor.c upgrade.c util.c \ - wc_db.c wc_db_pristine.c wc_db_update_move.c wc_db_util.c \ - wc_db_wcroot.c wcroot_anchor.c workqueue.c +SRCS= adm_crawler.c \ + adm_files.c \ + adm_ops.c \ + ambient_depth_filter_editor.c \ + cleanup.c \ + conflicts.c \ + context.c \ + copy.c \ + crop.c \ + delete.c \ + deprecated.c \ + diff_editor.c \ + diff_local.c \ + entries.c \ + externals.c \ + info.c \ + lock.c \ + merge.c \ + node.c \ + old-and-busted.c \ + props.c \ + questions.c \ + relocate.c \ + revert.c \ + revision_status.c \ + status.c \ + translate.c \ + tree_conflicts.c \ + update_editor.c \ + upgrade.c \ + util.c \ + wc_db.c \ + wc_db_pristine.c \ + wc_db_update_move.c \ + wc_db_util.c \ + wc_db_wcroot.c \ + wcroot_anchor.c \ + workqueue.c -CFLAGS+= -I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR}/../.. \ -I${.CURDIR}/../libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"