Date: Mon, 13 Oct 2014 22:15:26 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273065 - in head: lib lib/libevent share/mk usr.sbin/ftp-proxy usr.sbin/ftp-proxy/ftp-proxy usr.sbin/ftp-proxy/libevent Message-ID: <201410132215.s9DMFQHM003173@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Oct 13 22:15:26 2014 New Revision: 273065 URL: https://svnweb.freebsd.org/changeset/base/273065 Log: Promote libevent to lib/ level and fold ftp-proxy into its parent Makefile. This allows us to use libevent for other application in the future. For now libevent is still INTERNALLIB and no shared library is installed. MFC after: 1 month Added: head/lib/libevent/ - copied from r273060, head/usr.sbin/ftp-proxy/libevent/ Deleted: head/usr.sbin/ftp-proxy/Makefile.inc head/usr.sbin/ftp-proxy/ftp-proxy/ head/usr.sbin/ftp-proxy/libevent/ Modified: head/lib/Makefile head/lib/libevent/Makefile head/share/mk/src.libnames.mk head/usr.sbin/ftp-proxy/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Mon Oct 13 21:08:27 2014 (r273064) +++ head/lib/Makefile Mon Oct 13 22:15:26 2014 (r273065) @@ -44,6 +44,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libdevstat \ libdwarf \ libedit \ + ${_libevent} \ libexecinfo \ libexpat \ libfetch \ @@ -226,6 +227,10 @@ _libnetgraph= libnetgraph _libypclnt= libypclnt .endif +.if ${MK_PF} != "no" +_libevent= libevent +.endif + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _libsmb= libsmb _libvgl= libvgl Modified: head/lib/libevent/Makefile ============================================================================== --- head/usr.sbin/ftp-proxy/libevent/Makefile Mon Oct 13 20:39:51 2014 (r273060) +++ head/lib/libevent/Makefile Mon Oct 13 22:15:26 2014 (r273065) @@ -1,10 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/pf/libevent +.PATH: ${.CURDIR}/../../contrib/pf/libevent +.include <src.opts.mk> + +LIB= event +SHLIB_MAJOR= 1 +PRIVATELIB= +INTERNALLIB= -LIB= event -INTERNALLIB=yes SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c HDRS= event.h Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Mon Oct 13 21:08:27 2014 (r273064) +++ head/share/mk/src.libnames.mk Mon Oct 13 22:15:26 2014 (r273065) @@ -21,6 +21,10 @@ LIBBSDSTATDIR= ${ROOTOBJDIR}/lib/libbsds LDBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.so LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a +LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent +LDEVENT?= ${LIBEVENTDIR}/libevent.so +LIBEVENT?= ${LIBEVENTDIR}/libevent.a + LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc LDHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.so LIBHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.a Modified: head/usr.sbin/ftp-proxy/Makefile ============================================================================== --- head/usr.sbin/ftp-proxy/Makefile Mon Oct 13 21:08:27 2014 (r273064) +++ head/usr.sbin/ftp-proxy/Makefile Mon Oct 13 22:15:26 2014 (r273065) @@ -1,5 +1,17 @@ # $FreeBSD$ -SUBDIR= libevent ftp-proxy +.PATH: ${.CURDIR}/../../contrib/pf/ftp-proxy -.include <bsd.subdir.mk> +PROG= ftp-proxy +MAN= ftp-proxy.8 + +SRCS= ftp-proxy.c filter.c + +CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent + +LDADD+= ${LIBEVENT} +DPADD+= ${LIBEVENT} + +WARNS?= 3 + +.include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410132215.s9DMFQHM003173>