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

6 files changed, 30 insertions, 27 deletions

diff --git a/lib/Makefile b/lib/Makefile
index a5ab970..c558f11 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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
diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/lib/libevent/Makefile
index a8ff09b..d8b1e20 100644
--- a/usr.sbin/ftp-proxy/libevent/Makefile
+++ b/lib/libevent/Makefile
@@ -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
 
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index bc41ea2..336ede1 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -21,6 +21,10 @@ LIBBSDSTATDIR=	${ROOTOBJDIR}/lib/libbsdstat
 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
diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
index 67660c8..7a3ef47 100644
--- a/usr.sbin/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/Makefile
@@ -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>
diff --git a/usr.sbin/ftp-proxy/Makefile.inc b/usr.sbin/ftp-proxy/Makefile.inc
deleted file mode 100644
index 9043d09..0000000
--- a/usr.sbin/ftp-proxy/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-LIBEVENT= ${.OBJDIR}/../libevent/libevent.a
-
-.include "../Makefile.inc"
diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
deleted file mode 100644
index de49888..0000000
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../../contrib/pf/ftp-proxy
-
-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>