Index: stable/10/lib/libc/tests/rpc/Makefile =================================================================== --- stable/10/lib/libc/tests/rpc/Makefile (revision 291815) +++ stable/10/lib/libc/tests/rpc/Makefile (revision 291816) @@ -1,27 +1,27 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/lib/libc/rpc SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} NETBSD_ATF_TESTS_C= rpc_test NETBSD_ATF_TESTS_C+= xdr_test RPCSRC= h_testbits.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C h_testbits.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} h_testbits_xdr.c: ${RPCSRC} h_testbits.h ${RPCGEN} ${.ALLSRC:M*.x} CLEANFILES+= ${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c CFLAGS+= -I${.OBJDIR} -DPSRCS+= h_testbits.h +SRCS+= h_testbits.h LDADD+= -lrpcsvc -lutil DPADD+= ${LIBRPCSVC} ${LIBUTIL} .include "../Makefile.netbsd-tests" .include Index: stable/10/usr.bin/kdump/Makefile =================================================================== --- stable/10/usr.bin/kdump/Makefile (revision 291815) +++ stable/10/usr.bin/kdump/Makefile (revision 291816) @@ -1,44 +1,43 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include .if (${MACHINE_ARCH} == "amd64") SFX= 32 .endif .PATH: ${.CURDIR}/../ktrace PROG= kdump -SRCS= kdump_subr.c kdump.c ioctl.c subr.c -DPSRCS= kdump_subr.h +SRCS= kdump_subr.c kdump_subr.h kdump.c ioctl.c subr.c CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. .if ${MK_PF} != "no" CFLAGS+=-DPF .endif NO_WERROR?= YES CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") CLEANFILES+= linux_syscalls.c .endif ioctl.c: mkioctls env MACHINE=${MACHINE} CPP="${CPP}" \ sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} kdump_subr.h: mksubr sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET} kdump_subr.c: mksubr kdump_subr.h sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux${SFX}/syscalls.master ${.CURDIR}/linux_syscalls.conf .endif .include Index: stable/10/usr.bin/netstat/Makefile =================================================================== --- stable/10/usr.bin/netstat/Makefile (revision 291815) +++ stable/10/usr.bin/netstat/Makefile (revision 291816) @@ -1,53 +1,53 @@ # @(#)Makefile 8.1 (Berkeley) 6/12/93 # $FreeBSD$ .include PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \ unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \ - flowtable.c + flowtable.c nl_defs.h WARNS?= 3 CFLAGS+=-fno-strict-aliasing CFLAGS+=-DIPSEC CFLAGS+=-DSCTP .if ${MK_INET_SUPPORT} != "no" CFLAGS+=-DINET .endif .if ${MK_INET6_SUPPORT} != "no" SRCS+= inet6.c CFLAGS+=-DINET6 .endif .if ${MK_OFED} != "no" CFLAGS+=-DSDP .endif .if ${MK_PF} != "no" CFLAGS+=-DPF .endif BINGRP= kmem BINMODE=2555 DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} LDADD= -lkvm -lmemstat -lutil .if ${MK_NETGRAPH_SUPPORT} != "no" SRCS+= netgraph.c DPADD+= ${LIBNETGRAPH} LDADD+= -lnetgraph CFLAGS+=-DNETGRAPH .endif .if ${MK_IPX_SUPPORT} != "no" SRCS+= ipx.c DPADD+= ${LIBIPX} LDADD+= -lipx CFLAGS+=-DIPX .endif .include Index: stable/10/usr.bin/svn/svn/Makefile =================================================================== --- stable/10/usr.bin/svn/svn/Makefile (revision 291815) +++ stable/10/usr.bin/svn/svn/Makefile (revision 291816) @@ -1,70 +1,70 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svn PROG= svn${SVNLITE} SRCS= add-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 status-cmd.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 \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ -L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ -L${LIBSQLITEDIR} -lsqlite3 \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread 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} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) -DPSRCS+= freebsd-organization.h +SRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h CFLAGS+= -I. -DHAS_ORGANIZATION_NAME freebsd-organization.h: @echo "#define ORGANIZATION_NAME \"$$(eval echo ${ORGANIZATION})\"" \ > freebsd-organization.h .endif svnlite.1: svn.1 # Avoid the website sed -E 's,(^| |B|`)svn,\1svnlite,g' ${SVNDIR}/svn/svn.1 > ${.OBJDIR}/svnlite.1 .include Index: stable/10 =================================================================== --- stable/10 (revision 291815) +++ stable/10 (revision 291816) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r291330