Cleanout __FreeBSD__ defines which are not needed.
authorDavid Rhodus <drhodus@dragonflybsd.org>
Wed, 21 Jul 2004 16:13:43 +0000 (16:13 +0000)
committerDavid Rhodus <drhodus@dragonflybsd.org>
Wed, 21 Jul 2004 16:13:43 +0000 (16:13 +0000)
lib/libpcap/Makefile
lib/libsm/Makefile
usr.bin/kdump/Makefile
usr.bin/truss/Makefile

index 0f1a314..45c54f4 100644 (file)
@@ -1,6 +1,6 @@
 # Makefile for libpcap
 # $FreeBSD: src/lib/libpcap/Makefile,v 1.24.2.4 2002/07/22 14:21:50 ru Exp $
-# $DragonFly: src/lib/libpcap/Makefile,v 1.4 2004/05/15 12:28:33 eirikn Exp $
+# $DragonFly: src/lib/libpcap/Makefile,v 1.5 2004/07/21 16:13:42 drhodus Exp $
 
 LIB=    pcap
 SRCS=  grammar.y tokdefs.h pcap-bpf.c version.h \
@@ -17,12 +17,6 @@ CFLAGS+=-D_U_="__attribute__((unused))"
 CFLAGS+=-DINET6
 .endif
 
-# workaround bogus libpcap 0.6.2 contrib code which tries to extern the
-# system supplied function ether_hostton().  Setting __FreeBSD__ prevents
-# it from declaring the extern.
-#
-CFLAGS+=-D__FreeBSD__
-
 SHLIB_MAJOR=2
 SHLIB_MINOR=5
 
index e5cf107..102ed27 100644 (file)
@@ -1,15 +1,11 @@
 # $FreeBSD: src/lib/libsm/Makefile,v 1.1.2.2 2002/07/19 18:46:26 ru Exp $
-# $DragonFly: src/lib/libsm/Makefile,v 1.4 2004/02/03 06:26:30 dillon Exp $
+# $DragonFly: src/lib/libsm/Makefile,v 1.5 2004/07/21 16:13:42 drhodus Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/libsm
 
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+=-DNETINET6 -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
-# Sendmail doesn't know about DFly, make believe we are FreeBSD
-# to get reasonable defaults.
-#
-CFLAGS+= -D__FreeBSD__ -D__FreeBSD_version=480101
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
index 579a039..1099a0d 100644 (file)
@@ -1,13 +1,12 @@
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 # $FreeBSD: src/usr.bin/kdump/Makefile,v 1.4.2.2 2002/07/23 09:16:07 ru Exp $
-# $DragonFly: src/usr.bin/kdump/Makefile,v 1.4 2004/02/04 14:36:11 rob Exp $
+# $DragonFly: src/usr.bin/kdump/Makefile,v 1.5 2004/07/21 16:13:42 drhodus Exp $
 
 .PATH: ${.CURDIR}/../ktrace
 
 PROG=          kdump
 SRCS=          kdump.c ioctl.c subr.c
 CFLAGS+=       -I${.CURDIR}/../ktrace -I${.CURDIR}/../.. -I${.CURDIR}/../../sys
-CFLAGS+=       -D__FreeBSD__
 
 CLEANFILES=    ioctl.c
 
index b8f2c4e..8cccbd7 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/truss/Makefile,v 1.10.2.2 2002/07/23 09:18:30 ru Exp $
-# $DragonFly: src/usr.bin/truss/Makefile,v 1.5 2004/02/04 14:36:11 rob Exp $
+# $DragonFly: src/usr.bin/truss/Makefile,v 1.6 2004/07/21 16:13:43 drhodus Exp $
 
 PROG=  truss
 SRCS=  main.c setup.c syscalls.c syscalls.h ioctl.c
@@ -10,8 +10,7 @@ SRCS+=        i386-fbsd.c i386-linux.c linux_syscalls.h
 .endif
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -I.
-# kernel files need __FreeBSD__ defined for now
-CFLAGS+= -D__FreeBSD__
+
 CLEANFILES+=i386l-syscalls.master syscalls.master linux_syscalls.h \
        syscalls.h ioctl.c