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 /sbin/rcorder | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'sbin/rcorder')
| -rw-r--r-- | sbin/rcorder/Makefile | 12 | ||||
| -rw-r--r-- | sbin/rcorder/Makefile.depend | 2 | ||||
| -rw-r--r-- | sbin/rcorder/rcorder.c | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile index b71aa4b..2f1bbac 100644 --- a/sbin/rcorder/Makefile +++ b/sbin/rcorder/Makefile @@ -5,16 +5,10 @@ PROG= rcorder SRCS= ealloc.c hash.c rcorder.c MAN= rcorder.8 -LDADD= -lutil -DPADD= ${LIBUTIL} +LIBADD= util -# XXX hack for make's hash.[ch] -CFLAGS+= -DORDER -I. +CFLAGS+= -DORDER -SRCS+= util.h -CLEANFILES+= util.h - -util.h: - ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET} +#CFLAGS+= -DDEBUG .include <bsd.prog.mk> diff --git a/sbin/rcorder/Makefile.depend b/sbin/rcorder/Makefile.depend index ed049c9..78b235b 100644 --- a/sbin/rcorder/Makefile.depend +++ b/sbin/rcorder/Makefile.depend @@ -17,6 +17,4 @@ DIRDEPS = \ .if ${DEP_RELDIR} == ${_DEP_RELDIR} # local dependencies - needed for -jN in clean tree -rcorder.o: util.h -rcorder.po: util.h .endif diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c index 83f6df8..8c46b4f 100644 --- a/sbin/rcorder/rcorder.c +++ b/sbin/rcorder/rcorder.c @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> +#include <libutil.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <util.h> #include "ealloc.h" #include "sprite.h" |
