From c292cf660ef0b9a996258ed4b4f1724129af9abf Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 3 Jan 2000 12:01:30 +0000
Subject: [PATCH] Remove -g compiler flag.

---
 lib/libnetgraph/Makefile          | 2 +-
 sbin/vinum/Makefile               | 2 +-
 sys/modules/usb/Makefile          | 1 -
 usr.sbin/i4b/dtmfdecode/Makefile  | 2 +-
 usr.sbin/i4b/g711conv/Makefile    | 2 +-
 usr.sbin/pccard/Makefile.inc      | 4 +++-
 usr.sbin/tcpdump/tcpdump/Makefile | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 342b2e57ce32..fe96f3d42fc6 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -9,7 +9,7 @@ SHLIB_MAJOR=	1
 
 SRCS=		sock.c msg.c debug.c
 
-CFLAGS+=	-g -Wall
+CFLAGS+=	-Wall
 
 beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/netgraph.h \
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index a22a645c1795..7207884456c9 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -5,7 +5,7 @@ PROG=	vinum
 SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
 MAN8=	vinum.8
 
-CFLAGS+=	-I${.CURDIR}/../../sys -g -Wall -DVINUMDEBUG
+CFLAGS+=	-I${.CURDIR}/../../sys -Wall -DVINUMDEBUG
 DPADD=		${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP}
 LDADD=		-lutil -lreadline -ltermcap -ldevstat
 
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index edd1cba6b500..e372b737dd8b 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -24,7 +24,6 @@ SRCS		+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
 SRCS		+= opt_bus.h pci_if.h
 
 NOMAN		 =
-CFLAGS		+= -g
 
 opt_usb.h:
 	echo > opt_usb.h
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index ed0af4eded66..0623e128e162 100644
--- a/usr.sbin/i4b/dtmfdecode/Makefile
+++ b/usr.sbin/i4b/dtmfdecode/Makefile
@@ -12,7 +12,7 @@ SRC             =       dtmfdecode.c
 # libm is only necessary if USE_COS is defined in the source
 #LDADD          +=      -lm
 
-CFLAGS          +=      -Wall -g -DDEBUG
+CFLAGS          +=      -Wall -DDEBUG
 MAN1		=	dtmfdecode.1
 
 test:   ${PROG}
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index f96de268deea..c02dd5f8ca57 100644
--- a/usr.sbin/i4b/g711conv/Makefile
+++ b/usr.sbin/i4b/g711conv/Makefile
@@ -8,7 +8,7 @@
 
 PROG		=	g711conv
 SRC		=	g711conv.c
-CFLAGS		+= 	-Wall -g
+CFLAGS		+= 	-Wall
 MAN1		=	g711conv.1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index 3d73c9ecfcbd..6503c10dcf9a 100644
--- a/usr.sbin/pccard/Makefile.inc
+++ b/usr.sbin/pccard/Makefile.inc
@@ -1,2 +1,4 @@
-CFLAGS+= -Wall -g -static
+# $FreeBSD$
+
+CFLAGS+= -Wall -static
 BINDIR?= /usr/sbin
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index e352b1dbc4ce..145a03c94f95 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -4,7 +4,7 @@ PROG=	tcpdump
 CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_NET_SLIP_H=1 -DTIME_WITH_SYS_TIME=1 \
 	-DHAVE_ETHER_NTOHOST=1 -DHAVE_SETLINEBUF=1 -DSTDC_HEADERS=1 \
 	-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SOCKADDR_SA_LEN=1 \
-	-DHAVE_TM_GMTOFF=1 -DLBL_ALIGN=1 -DPPP -DHAVE_FDDI -g
+	-DHAVE_TM_GMTOFF=1 -DLBL_ALIGN=1 -DPPP -DHAVE_FDDI
 MAN1=	tcpdump.1
 SRCS =	version.c tcpdump.c \
 	print-arp.c print-atalk.c print-atm.c print-fr.c print-bootp.c \