summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/librthread/Makefile3
-rw-r--r--lib/libsndio/Makefile3
-rw-r--r--libexec/ld.so/Makefile3
-rw-r--r--sbin/ldattach/Makefile3
-rw-r--r--sys/arch/amd64/stand/Makefile.inc3
-rw-r--r--usr.bin/pctr/Makefile3
-rw-r--r--usr.sbin/iscsictl/Makefile3
-rw-r--r--usr.sbin/mksuncd/Makefile3
-rw-r--r--usr.sbin/relayctl/Makefile3
-rw-r--r--usr.sbin/tftp-proxy/Makefile3
-rw-r--r--usr.sbin/tftpd/Makefile3
11 files changed, 22 insertions, 11 deletions
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index f81484f838a..37094c6f116 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/08/15 18:08:22 matthew Exp $
+# $OpenBSD: Makefile,v 1.33 2012/09/12 09:19:54 haesbaert Exp $
# For ``COMPILER_VERSION''
.include <bsd.own.mk>
@@ -13,6 +13,7 @@ CFLAGS+=-Wmissing-prototypes
CFLAGS+=-Wstrict-prototypes
CFLAGS+=-Wsign-compare
CFLAGS+=-I${LIBCSRCDIR}/arch/${MACHINE_CPU} -I${LIBCSRCDIR}/include
+CDIAGFLAGS=
LDADD = -Wl,-znodelete,-zinitfirst,-znodlopen
.PATH: ${.CURDIR}/arch/${MACHINE_CPU}
diff --git a/lib/libsndio/Makefile b/lib/libsndio/Makefile
index 642b8b6382e..ee555ab0958 100644
--- a/lib/libsndio/Makefile
+++ b/lib/libsndio/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2011/04/27 21:20:36 ratchov Exp $
+# $OpenBSD: Makefile,v 1.9 2012/09/12 09:19:54 haesbaert Exp $
LIB= sndio
MAN= sio_open.3 mio_open.3 sndio.7
SRCS= debug.c aucat.c sio_aucat.c sio_sun.c sio.c \
mio_rmidi.c mio_aucat.c mio.c
CFLAGS+=-Wall -Wstrict-prototypes -Werror -Wundef -DDEBUG
+CDIAGFLAGS=
MLINKS = \
sio_open.3 sio_close.3 \
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile
index 49fb2826a6f..62dde2b36a2 100644
--- a/libexec/ld.so/Makefile
+++ b/libexec/ld.so/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2012/08/31 20:09:27 kettenis Exp $
+# $OpenBSD: Makefile,v 1.39 2012/09/12 09:19:54 haesbaert Exp $
SUBDIR=ldconfig ldd
@@ -29,6 +29,7 @@ DEBUG?= -g
CFLAGS += -Wall -Werror
CFLAGS += -I${.CURDIR} -I${.CURDIR}/${MACHINE_CPU} \
-Dstrsep=_dl_strsep
+CDIAGFLAGS=
INSTALL_STRIP=
ELF_LDFLAGS+=--shared -Bsymbolic --no-undefined
diff --git a/sbin/ldattach/Makefile b/sbin/ldattach/Makefile
index 0b1225111df..5a2011e43c4 100644
--- a/sbin/ldattach/Makefile
+++ b/sbin/ldattach/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2008/06/09 21:06:10 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.3 2012/09/12 09:19:54 haesbaert Exp $
PROG= ldattach
SRCS= ldattach.c atomicio.c
MAN= ldattach.8
CFLAGS+= -Wall -Werror
+CDIAGFLAGS=
LDADD+= -lutil
BINDIR= /sbin
diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc
index d844ffd6272..a5b46c79408 100644
--- a/sys/arch/amd64/stand/Makefile.inc
+++ b/sys/arch/amd64/stand/Makefile.inc
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.7 2012/08/29 17:45:00 pascal Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2012/09/12 09:19:54 haesbaert Exp $
CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
CFLAGS+= -fno-stack-protector
+CDIAGFLAGS=
CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
SACFLAGS=-D_STANDALONE
DEBUGLIBS=no
diff --git a/usr.bin/pctr/Makefile b/usr.bin/pctr/Makefile
index 2112272a5a2..d5c8aa14ecd 100644
--- a/usr.bin/pctr/Makefile
+++ b/usr.bin/pctr/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2007/10/17 02:30:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.8 2012/09/12 09:19:54 haesbaert Exp $
MAN=pctr.1
CFLAGS+=-W -Wall -Werror
+CDIAGFLAGS=
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
PROG= pctr
diff --git a/usr.sbin/iscsictl/Makefile b/usr.sbin/iscsictl/Makefile
index 0ae4e8c881b..1781ab9799e 100644
--- a/usr.sbin/iscsictl/Makefile
+++ b/usr.sbin/iscsictl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2012/06/26 21:09:44 claudio Exp $
+# $OpenBSD: Makefile,v 1.4 2012/09/12 09:19:54 haesbaert Exp $
.PATH: ${.CURDIR}/../iscsid
@@ -13,6 +13,7 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
CFLAGS+= -Wsign-compare
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../iscsid
+CDIAGFLAGS=
YFLAGS=
.include <bsd.prog.mk>
diff --git a/usr.sbin/mksuncd/Makefile b/usr.sbin/mksuncd/Makefile
index aea07208ae7..b4bb250851a 100644
--- a/usr.sbin/mksuncd/Makefile
+++ b/usr.sbin/mksuncd/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/09/12 15:59:37 jmc Exp $
+# $OpenBSD: Makefile,v 1.3 2012/09/12 09:19:54 haesbaert Exp $
.if ${MACHINE} == "sparc64"
PROG= mksuncd
CFLAGS+=-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
+CDIAGFLAGS=
.else
NOPROG=
diff --git a/usr.sbin/relayctl/Makefile b/usr.sbin/relayctl/Makefile
index 919871e6ebd..a3aa995f2a5 100644
--- a/usr.sbin/relayctl/Makefile
+++ b/usr.sbin/relayctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/05/26 16:44:32 nicm Exp $
+# $OpenBSD: Makefile,v 1.5 2012/09/12 09:19:54 haesbaert Exp $
.PATH: ${.CURDIR}/../relayd
@@ -14,5 +14,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wmissing-declarations
CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
CFLAGS+= -Wsign-compare -Wbounded
+CDIAGFLAGS=
.include <bsd.prog.mk>
diff --git a/usr.sbin/tftp-proxy/Makefile b/usr.sbin/tftp-proxy/Makefile
index 7603dd23a4a..929696ecdcd 100644
--- a/usr.sbin/tftp-proxy/Makefile
+++ b/usr.sbin/tftp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2012/07/11 12:07:32 dlg Exp $
+# $OpenBSD: Makefile,v 1.4 2012/09/12 09:19:54 haesbaert Exp $
PROG= tftp-proxy
SRCS= tftp-proxy.c filter.c
@@ -7,5 +7,6 @@ LDADD= -levent
DPADD= ${LIBEVENT}
CFLAGS+=-Wall -Werror
+CDIAGFLAGS=
.include <bsd.prog.mk>
diff --git a/usr.sbin/tftpd/Makefile b/usr.sbin/tftpd/Makefile
index 21ad34d43f7..8ecff27caaa 100644
--- a/usr.sbin/tftpd/Makefile
+++ b/usr.sbin/tftpd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2012/03/08 03:17:10 dlg Exp $
+# $OpenBSD: Makefile,v 1.5 2012/09/12 09:19:54 haesbaert Exp $
PROG= tftpd
SRCS= tftpd.c
LDADD= -levent
DPADD= ${LIBEVENT}
CFLAGS+= -Wall -Werror
+CDIAGFLAGS=
MAN= tftpd.8