Use CSTD and remove local CSTD settings which are no longer needed.
authorSascha Wildner <saw@online.de>
Sun, 16 Jan 2011 07:06:43 +0000 (08:06 +0100)
committerSascha Wildner <saw@online.de>
Sun, 16 Jan 2011 08:27:25 +0000 (09:27 +0100)
Also, stick with gnu89 for lib/liblvm and libexec/tcpd for now.

gnu/lib/liblvm/Makefile
lib/liblzma/Makefile
lib/libstand/Makefile
libexec/tcpd/Makefile
sys/boot/pc32/boot2/Makefile
usr.bin/lzmainfo/Makefile
usr.bin/xz/Makefile
usr.bin/xzdec/Makefile

index 03c7651..64807d6 100644 (file)
@@ -28,6 +28,7 @@ SRCS+=                activate.c lvmcache.c toolcontext.c config.c btree.c \
                filter_dragonfly.c snapshot.c mirrored.c dev_manager.c fs.c \
                lvm-globals.c dev.c
 
+CSTD?=         gnu89
 WARNS?=                1
 
 .PATH: ${LVM2_DISTDIR}/lib/
index c6ae0d8..dc3641d 100644 (file)
@@ -109,7 +109,7 @@ SRCS+=      simple_coder.c \
        sparc.c
 
 WARNS?=        3
-CSTD=  gnu99
+
 CFLAGS+= -DHAVE_CONFIG_H -DTUKLIB_SYMBOL_PREFIX=lzma_ \
        -I${.CURDIR} \
        -I${LZMADIR}/api \
index d1d8657..390df95 100644 (file)
@@ -1,5 +1,4 @@
 # $FreeBSD: src/lib/libstand/Makefile,v 1.14.2.10 2002/07/22 14:21:50 ru Exp $
-# $DragonFly: src/lib/libstand/Makefile,v 1.12 2008/10/28 16:54:09 swildner Exp $
 #
 # Originally from      $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
@@ -13,10 +12,11 @@ NOPROFILE=  YES
 NOPIC=         YES
 INCS=          stand.h
 MAN=           libstand.3
+CSTD?=         c99
 WARNS?=                2
 
 # Mostly OK, some of the libc imports are a bit noisy
-CFLAGS+=       -ffreestanding -std=c99
+CFLAGS+=       -ffreestanding
 
 .if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+=       -m32 -mpreferred-stack-boundary=2
index 1306303..f36909c 100644 (file)
@@ -2,6 +2,7 @@
 
 PROG=  tcpd
 MAN=   tcpd.8
+CSTD?= gnu89
 WARNS?=        1
 
 CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
index 45a8d7d..97fd6b1 100644 (file)
@@ -1,11 +1,12 @@
 # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $
-# $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.18 2008/09/13 11:45:45 corecode Exp $
 
 BINDIR?=       /boot
 BINMODE=       444
 CLEANFILES=    boot \
                sio.o
 
+CSTD?=         c99
+
 NM?=           nm
 NXCFLAGS=
 NXLDFLAGS=
@@ -45,7 +46,6 @@ ORG2= `${.OBJDIR}/bootasmdef.nx BOOT2_VORIGIN`
 #      -mno-align-long-strings
 CFLAGS=        -elf -ffreestanding -Os -fno-builtin \
        -fomit-frame-pointer \
-       -std=c99 \
        -DBOOT2 \
        -I${.CURDIR}/../../common \
        -I${.CURDIR}/../../../../lib/libstand \
index e738f15..3340618 100644 (file)
@@ -8,7 +8,6 @@ SRCS=   lzmainfo.c
 .PATH: ${XZDIR}/common
 SRCS+= tuklib_progname.c tuklib_exit.c
 
-CSTD?= gnu99
 CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR}/../../lib/liblzma -I${XZDIR}/common
 
index 55aaafd..04368a9 100644 (file)
@@ -35,7 +35,7 @@ SRCS+=        tuklib_open_stdxxx.c \
        tuklib_mbstr_fw.c
 
 WARNS?=        3
-CSTD?= gnu99
+
 CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR}/../../lib/liblzma -I${XZDIR}/common
 
index e77e3f9..850aec1 100644 (file)
@@ -11,7 +11,6 @@ SRCS= xzdec.c
 .PATH: ${XZDIR}/common
 SRCS+= tuklib_progname.c tuklib_exit.c
 
-CSTD?= gnu99
 CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR}/../../lib/liblzma -I${XZDIR}/common