Index: tools/tools/netmap/Makefile =================================================================== --- tools/tools/netmap/Makefile +++ tools/tools/netmap/Makefile @@ -3,7 +3,7 @@ # # For multiple programs using a single source file each, # we can just define 'progs' and create custom targets. -PROGS = pkt-gen nmreplay bridge vale-ctl lb +PROGS = pkt-gen nmreplay bridge lb CLEANFILES = $(PROGS) *.o MAN= @@ -32,8 +32,5 @@ nmreplay: nmreplay.o $(CC) $(CFLAGS) -o nmreplay nmreplay.o $(LDFLAGS) -vale-ctl: vale-ctl.o - $(CC) $(CFLAGS) -o vale-ctl vale-ctl.o - lb: lb.o pkt_hash.o $(CC) $(CFLAGS) -o lb lb.o pkt_hash.o $(LDFLAGS) Index: usr.sbin/vale-ctl/Makefile =================================================================== --- /dev/null +++ usr.sbin/vale-ctl/Makefile @@ -0,0 +1,11 @@ +# @(#)Makefile 8.2 (Berkeley) 4/18/94 +# $FreeBSD$ + +PROG= vale-ctl +MAN= vale-ctl.4 + +#LIBADD= xo + +WARNS?= 3 + +.include Index: usr.sbin/vale-ctl/Makefile.depend =================================================================== --- /dev/null +++ usr.sbin/vale-ctl/Makefile.depend @@ -0,0 +1,10 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: usr.sbin/vale-ctl/vale-ctl.c =================================================================== --- usr.sbin/vale-ctl/vale-ctl.c +++ usr.sbin/vale-ctl/vale-ctl.c @@ -42,10 +42,8 @@ #include /* basename */ #include /* atoi, free */ -/* XXX cut and paste from pkt-gen.c because I'm not sure whether this - * program may include nm_util.h - */ -void parse_nmr_config(const char* conf, struct nmreq *nmr) +static void +parse_nmr_config(const char* conf, struct nmreq *nmr) { char *w, *tok; int i, v;