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

4 files changed, 14 insertions, 51 deletions

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>
diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/usr.sbin/ftp-proxy/libevent/Makefile
deleted file mode 100644
index a8ff09b..0000000
--- a/usr.sbin/ftp-proxy/libevent/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../../contrib/pf/libevent
-
-
-LIB=	event
-INTERNALLIB=yes
-SRCS=	buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
-HDRS=	event.h
-
-CFLAGS+= -I${.CURDIR} \
-	-DHAVE_CLOCK_GETTIME \
-	-DHAVE_FCNTL_H \
-	-DHAVE_POLL \
-	-DHAVE_SELECT \
-	-DHAVE_SETFD \
-	-DHAVE_STDARG_H \
-	-DHAVE_SYS_IOCTL_H \
-	-DHAVE_SYS_TIME_H \
-	-DHAVE_UNISTD_H \
-	-DHAVE_VASPRINTF \
-	-DHAVE_WORKING_KQUEUE \
-	-DVERSION='"1.3b"'
-
-WARNS?=	2
-
-.include <bsd.lib.mk>