Permalink
Browse files

Use CSTD and remove local CSTD settings which are no longer needed.

Also, stick with gnu89 for lib/liblvm and libexec/tcpd for now.
  • Loading branch information...
1 parent 7281946 commit 2983445f8123c6675f95e89f962e6e860bdbe113 Sascha Wildner committed Jan 16, 2011
@@ -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/
@@ -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 \
@@ -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
@@ -2,6 +2,7 @@
PROG= tcpd
MAN= tcpd.8
+CSTD?= gnu89
WARNS?= 1
CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
@@ -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 \
@@ -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
View
@@ -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
@@ -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

0 comments on commit 2983445

Please sign in to comment.