d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promote libevent to lib/ level and fold ftp-proxy into its parent Makefile.

Browse Source 
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:
Xin LI 2014-10-13 22:15:26 +00:00
parent d6f180ad78
commit f972197651
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=273065
6 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Makefile
View File

@ -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

10
usr.sbin/ftp-proxy/libevent/Makefile → lib/libevent/Makefile
View File

@ -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

4
share/mk/src.libnames.mk
View File

@ -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

16
usr.sbin/ftp-proxy/Makefile
View File

@ -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>

5
usr.sbin/ftp-proxy/Makefile.inc
View File

@ -1,5 +0,0 @@
# $FreeBSD$
LIBEVENT= ${.OBJDIR}/../libevent/libevent.a
.include "../Makefile.inc"

17
usr.sbin/ftp-proxy/ftp-proxy/Makefile
View File

@ -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>