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
This commit is contained in:
parent
d6f180ad78
commit
f972197651
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273065
@ -44,6 +44,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
|
|||||||
libdevstat \
|
libdevstat \
|
||||||
libdwarf \
|
libdwarf \
|
||||||
libedit \
|
libedit \
|
||||||
|
${_libevent} \
|
||||||
libexecinfo \
|
libexecinfo \
|
||||||
libexpat \
|
libexpat \
|
||||||
libfetch \
|
libfetch \
|
||||||
@ -226,6 +227,10 @@ _libnetgraph= libnetgraph
|
|||||||
_libypclnt= libypclnt
|
_libypclnt= libypclnt
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if ${MK_PF} != "no"
|
||||||
|
_libevent= libevent
|
||||||
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
||||||
_libsmb= libsmb
|
_libsmb= libsmb
|
||||||
_libvgl= libvgl
|
_libvgl= libvgl
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
# $FreeBSD$
|
# $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
|
SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
|
||||||
HDRS= event.h
|
HDRS= event.h
|
||||||
|
|
@ -21,6 +21,10 @@ LIBBSDSTATDIR= ${ROOTOBJDIR}/lib/libbsdstat
|
|||||||
LDBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.so
|
LDBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.so
|
||||||
LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a
|
LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a
|
||||||
|
|
||||||
|
LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent
|
||||||
|
LDEVENT?= ${LIBEVENTDIR}/libevent.so
|
||||||
|
LIBEVENT?= ${LIBEVENTDIR}/libevent.a
|
||||||
|
|
||||||
LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc
|
LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc
|
||||||
LDHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.so
|
LDHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.so
|
||||||
LIBHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.a
|
LIBHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.a
|
||||||
|
@ -1,5 +1,17 @@
|
|||||||
# $FreeBSD$
|
# $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>
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
# $FreeBSD$
|
|
||||||
|
|
||||||
LIBEVENT= ${.OBJDIR}/../libevent/libevent.a
|
|
||||||
|
|
||||||
.include "../Makefile.inc"
|
|
@ -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>
|
|
Loading…
Reference in New Issue
Block a user