Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unravel the include spaghetti here: 

- make a copy of cfparse.y called "y.tab.y" because "cfparse.h" is not
  actually the yacc generated header file (duh?)
- include the tcpdump directory with -I *after* racoon's source, else
  tcpdump's headers will be picked up unexpectedly
- include . *before* racoon's source so as to make the generated files
  first on the list
This commit is contained in:
tv 2001-10-19 23:59:56 +00:00
parent f526c532b2
commit 29fb1f6827
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/racoon/racoon/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2001/10/05 23:42:11 veego Exp $
# $NetBSD: Makefile,v 1.11 2001/10/19 23:59:56 tv Exp $
.include <bsd.own.mk>
@ -9,7 +9,7 @@ SRCS= main.c session.c isakmp.c handler.c random.c \
gssapi.c \
pfkey.c admin.c ipsec_doi.c oakley.c grabmyaddr.c \
policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
cfparse.c cftoken.c strnames.c \
y.tab.y cftoken.l strnames.c \
vmbuf.c plog.c logger.c schedule.c str2val.c misc.c sockmisc.c \
proposal.c sainfo.c vendorid.c safefile.c backupsa.c \
dnssec.c getcertsbyname.c
@ -17,14 +17,6 @@ SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c
MAN= racoon.8 racoon.conf.5
# debugging code with print-isakmp.c
SRCS+= print-isakmp.c
CPPFLAGS+=-DRACOON_PKG_VERSION="\"${PKGVERSION}\""
CPPFLAGS+=-I${TCPDUMPSRCDIR} -I${TCPDUMPSRCDIR}/lbl -DHAVE_PRINT_ISAKMP_C=1
.if (${MKKERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
.endif
LIBPFKEYDIR!= cd ${.CURDIR}/../libpfkey; ${PRINTOBJDIR}
LDADD+= -L${LIBPFKEYDIR} -lpfkey
DPADD+= ${LIBPFKEYDIR}/libpfkey.a
@ -37,7 +29,7 @@ DPADD+= ${LIBIPSEC} ${LIBY} ${LIBL} ${LIBCRYPTO}
#CFLAGS+=-g
OPTFLAG+=-DHAVE_PFKEYV2 -DYIPS_DEBUG
CPPFLAGS+=-DINET6 -DHAVE_FUNCTION_MACRO=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBL=1 -DHAVE_LIBY=1 -DENABLE_IPV6=1 -DADVAPI=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_VPRINTF=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_STRERROR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_STRDUP=1 $(OPTFLAG) -DIPSEC -I${RACOONSRCDIR} -I. -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"$(ETCDIR)\"
CPPFLAGS+=-DINET6 -DHAVE_FUNCTION_MACRO=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBL=1 -DHAVE_LIBY=1 -DENABLE_IPV6=1 -DADVAPI=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_VPRINTF=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_STRERROR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_STRDUP=1 $(OPTFLAG) -DIPSEC -I. -I${RACOONSRCDIR} -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"$(ETCDIR)\"
CPPFLAGS+=-DHAVE_OPENSSL_OPENSSLV_H=1
CPPFLAGS+=-DYY_NO_UNPUT
CPPFLAGS+=-I${LIBPFKEYSRCDIR}
@ -45,7 +37,15 @@ CPPFLAGS+=-I${RACOONSRCDIR}/missing
.if (${MKKERBEROS} != "no")
CPPFLAGS+=-DHAVE_GSSAPI
.endif
YFLAGS+=-d
YHEADER=1
# debugging code with print-isakmp.c
SRCS+= print-isakmp.c
CPPFLAGS+=-DRACOON_PKG_VERSION="\"${PKGVERSION}\""
CPPFLAGS+=-I${TCPDUMPSRCDIR} -I${TCPDUMPSRCDIR}/lbl -DHAVE_PRINT_ISAKMP_C=1
.if (${MKKERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
.endif
# Certificate support
CPPFLAGS+=-DHAVE_SIGNING_C=1 -DHAVE_OPENSSL_PEM_H=1 -DHAVE_OPENSSL_X509_H=1
@ -60,7 +60,9 @@ CPPFLAGS+=-DHAVE_SIGNING_C=1 -DHAVE_OPENSSL_PEM_H=1 -DHAVE_OPENSSL_X509_H=1
#LDSTATIC= -static
#.endif
CLEANFILES+= y.tab.h cfparse.c cftoken.c
CLEANFILES+= y.tab.y
y.tab.y: cfparse.y
cp $> $@
.include <bsd.prog.mk>