summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-05-19 18:57:03 +0000
committerphk <phk@FreeBSD.org>2002-05-19 18:57:03 +0000
commitaa08c897e4485ffee5ba2f6dadfb63bc9f3ed3dd (patch)
tree12cfbbcebac8e1135332af012de500f65d8315e7 /tools
parentac045ec61ff14c68b774e9c519b7da4c7792dc8a (diff)
downloadFreeBSD-src-aa08c897e4485ffee5ba2f6dadfb63bc9f3ed3dd.zip
FreeBSD-src-aa08c897e4485ffee5ba2f6dadfb63bc9f3ed3dd.tar.gz
Catch up with recent events.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/geom/GLib/Makefile5
-rw-r--r--tools/regression/geom/Makefile3
-rw-r--r--tools/regression/geom/Test/Makefile2
-rw-r--r--tools/regression/geom/geom_simdisk.c2
4 files changed, 7 insertions, 5 deletions
diff --git a/tools/regression/geom/GLib/Makefile b/tools/regression/geom/GLib/Makefile
index 0ea6b9a..758cf67 100644
--- a/tools/regression/geom/GLib/Makefile
+++ b/tools/regression/geom/GLib/Makefile
@@ -7,9 +7,10 @@ SRCS= geom.c geom_bsd.c geom_simdev.c geom_dump.c geom_event.c geom_io.c \
geom_sunlabel.c geom_pc98.c
-CFLAGS+= -g -static -W -Wall
-CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
+CFLAGS += -g -static -W -Wall
+CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
CFLAGS += -I/usr/local/include/xml -I/usr/src/sys -I..
+CFLAGS += -DKERNELSIM
NOPIC = static
NOPROFILE = bingo
NOOBJ = youbet
diff --git a/tools/regression/geom/Makefile b/tools/regression/geom/Makefile
index 48182a0..bbb5ddf 100644
--- a/tools/regression/geom/Makefile
+++ b/tools/regression/geom/Makefile
@@ -4,7 +4,8 @@ SUBDIR+= ConfCmp GLib Test
.include <bsd.subdir.mk>
-test: all _SUBDIRUSE
+test: all _SUBDIR
+
toflat:
scp *.c *.h *.sh Makefile root@flat:/sys/geom
diff --git a/tools/regression/geom/Test/Makefile b/tools/regression/geom/Test/Makefile
index e37b5c9..463c6ab 100644
--- a/tools/regression/geom/Test/Makefile
+++ b/tools/regression/geom/Test/Makefile
@@ -7,4 +7,4 @@ SUBDIR+= T010 T011 T012 T013 T014
.include <bsd.subdir.mk>
-test: _SUBDIRUSE
+test: _SUBDIR
diff --git a/tools/regression/geom/geom_simdisk.c b/tools/regression/geom/geom_simdisk.c
index ddc51fd..489e253 100644
--- a/tools/regression/geom/geom_simdisk.c
+++ b/tools/regression/geom/geom_simdisk.c
@@ -40,7 +40,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <strings.h>
+#include <string.h>
#include <err.h>
#include <sys/errno.h>
#include <sys/stat.h>
OpenPOWER on IntegriCloud