diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.sbin/rrenumd | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.sbin/rrenumd')
| -rw-r--r-- | usr.sbin/rrenumd/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/rrenumd/Makefile.depend | 1 | ||||
| -rw-r--r-- | usr.sbin/rrenumd/lexer.l | 4 | ||||
| -rw-r--r-- | usr.sbin/rrenumd/parser.y | 3 |
4 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile index 091e528..8c82fc3 100644 --- a/usr.sbin/rrenumd/Makefile +++ b/usr.sbin/rrenumd/Makefile @@ -23,8 +23,7 @@ YFLAGS= -d WARNS?= 2 -LDADD= -lipsec -ll -ly -DPADD= ${LIBIPSEC} ${LIBL} ${LIBY} +LIBADD= ipsec l y CLEANFILES= y.tab.h SRCS+= y.tab.h diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend index fdcd9a0..9ea337d 100644 --- a/usr.sbin/rrenumd/Makefile.depend +++ b/usr.sbin/rrenumd/Makefile.depend @@ -14,6 +14,7 @@ DIRDEPS = \ lib/libipsec \ lib/liby \ usr.bin/lex/lib \ + usr.bin/yacc.host \ .include <dirdeps.mk> diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l index 6e55f9e..47656e8 100644 --- a/usr.sbin/rrenumd/lexer.l +++ b/usr.sbin/rrenumd/lexer.l @@ -40,10 +40,6 @@ #include <string.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ - #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y index 65dfd46..6436df7 100644 --- a/usr.sbin/rrenumd/parser.y +++ b/usr.sbin/rrenumd/parser.y @@ -39,9 +39,6 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <netinet/in.h> #include <netinet/in_var.h> |
