summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-11-10 22:07:47 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-11-10 22:07:47 +0000
commit3e15ea9c2f144cc35252da55828024da223623b9 (patch)
tree1fc837d761247bd0069becf109f5aa6eebcfa00d
parente799b11d3352edb83ed0edcb94f7232e8a1fc219 (diff)
Use ${STATIC} rather than -static (dont hardcode). ok miod@
-rw-r--r--sbin/isakmpd/Makefile4
-rw-r--r--sbin/ping/Makefile4
-rw-r--r--sbin/ping6/Makefile4
-rw-r--r--usr.sbin/timed/timedc/Makefile4
-rw-r--r--usr.sbin/traceroute/Makefile4
-rw-r--r--usr.sbin/traceroute6/Makefile4
6 files changed, 12 insertions, 12 deletions
diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 2c04d8b7c29..9f38893b61c 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2004/08/23 11:16:49 ho Exp $
+# $OpenBSD: Makefile,v 1.58 2004/11/10 22:07:46 drahn Exp $
# $EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
#
@@ -56,7 +56,7 @@ FEATURES+= rawkey isakmp_cfg privsep nat_traversal dpd
PROG= isakmpd
BINDIR?= /sbin
-LDSTATIC?= -static
+LDSTATIC?= ${STATIC}
SRCS= app.c attribute.c cert.c connection.c constants.c conf.c \
cookie.c crypto.c dh.c doi.c exchange.c exchange_num.c \
field.c gmp_util.c hash.c if.c ike_auth.c ike_main_mode.c \
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 764d110881f..5108849e042 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2002/05/12 17:14:02 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2004/11/10 22:07:46 drahn Exp $
PROG= ping
MAN= ping.8
BINOWN= root
BINMODE=4555
-LDSTATIC=-static
+LDSTATIC=${STATIC}
.include <bsd.prog.mk>
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 25c97fd187e..392e64a42dc 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2002/10/25 02:25:43 itojun Exp $
+# $OpenBSD: Makefile,v 1.8 2004/11/10 22:07:46 drahn Exp $
PROG= ping6
MAN= ping6.8
@@ -11,6 +11,6 @@ CPPFLAGS+= -DINET6 -DHAVE_POLL_H
BINOWN= root
BINGRP= bin
BINMODE=4555
-LDSTATIC=-static
+LDSTATIC=${STATIC}
.include <bsd.prog.mk>
diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile
index a51057808ef..91e65aeff4e 100644
--- a/usr.sbin/timed/timedc/Makefile
+++ b/usr.sbin/timed/timedc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2004/01/23 21:07:38 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2004/11/10 22:07:45 drahn Exp $
#
# @(#)Makefile 5.4 (Berkeley) 5/11/93
PROG= timedc
SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c
MAN= timedc.8
-LDSTATIC=-static
+LDSTATIC=${STATIC}
.PATH: ${.CURDIR}/../timed
.include "../../Makefile.inc"
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index dc11c9d65d2..ab8ad2c92b8 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/05/12 17:14:04 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2004/11/10 22:07:46 drahn Exp $
PROG= traceroute
MAN= traceroute.8
BINOWN= root
BINMODE=4555
-LDSTATIC=-static
+LDSTATIC=${STATIC}
.include <bsd.prog.mk>
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index 3baed4f776c..512b6cb985a 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2002/05/12 17:14:04 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2004/11/10 22:07:46 drahn Exp $
PROG= traceroute6
BINOWN= root
BINGRP= bin
BINMODE=4555
-LDSTATIC=-static
+LDSTATIC=${STATIC}
CPPFLAGS+=-DINET6 -DHAVE_POLL