Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

libexec: Move the definition of WARNS to libexec/Makefile.inc.

This generally sets WARNS to 6 in libexec/ unless specified otherwise
in the individual Makefiles. Just like we do it in bin/, games/, sbin/,
usr.bin/ and usr.sbin/ already.

Also fix some warnings that crept up and clean up some Makefiles.
  • Loading branch information...
commit 8f5c3d2a2f46eb49934a84d5761b72fef21365c2 1 parent 55cc754
Sascha Wildner authored
View
1  libexec/Makefile.inc
@@ -1,3 +1,4 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
BINDIR?= /usr/libexec
+WARNS?= 6
View
3  libexec/atrun/Makefile
@@ -1,5 +1,4 @@
# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
-# $DragonFly: src/libexec/atrun/Makefile,v 1.3 2004/09/20 19:32:19 joerg Exp $
MAINSRC=${.CURDIR}/../../usr.bin/at
@@ -8,13 +7,11 @@ MAINSRC=${.CURDIR}/../../usr.bin/at
PROG= atrun
SRCS= atrun.c gloadavg.c
MAN= atrun.8
-WARNS?= 6
BINDIR= ${ATLIB_DIR}
CFLAGS+=-I${MAINSRC} -I${.CURDIR}
CFLAGS+=-DLOGIN_CAP -DPAM
-WFORMAT=0
DPADD= ${LIBPAM} ${LIBUTIL}
LDADD= ${MINUSLPAM} -lutil
View
13 libexec/bootpd/Makefile
@@ -1,17 +1,16 @@
# bootpd/Makefile
# $FreeBSD: src/libexec/bootpd/Makefile,v 1.8.2.1 2001/04/25 10:40:49 ru Exp $
-# $DragonFly: src/libexec/bootpd/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
PROG= bootpd
+SRCS= bootpd.c dovend.c readfile.c hash.c dumptab.c \
+ lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c
+MAN= bootptab.5 bootpd.8
+MLINKS= bootpd.8 bootpgw.8
+WARNS?= 2
+
CFLAGS+= -DETC_ETHERS
CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
SUBDIR= bootpgw tools
-SRCS= bootpd.c dovend.c readfile.c hash.c dumptab.c \
- lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c
-
-MAN= bootptab.5 bootpd.8
-MLINKS= bootpd.8 bootpgw.8
-
.include <bsd.prog.mk>
View
2  libexec/comsat/Makefile
@@ -1,9 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/comsat/Makefile,v 1.6.2.1 2001/04/25 10:40:50 ru Exp $
-# $DragonFly: src/libexec/comsat/Makefile,v 1.3 2005/05/03 17:22:01 liamfoy Exp $
PROG= comsat
MAN= comsat.8
-WARNS?= 6
.include <bsd.prog.mk>
View
4 libexec/dma/Makefile
@@ -1,6 +1,3 @@
-# $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
-#
-
CFLAGS+= -I${.CURDIR}
DPADD= ${LIBSSL} ${LIBCRYPTO}
@@ -14,6 +11,5 @@ MAN= dma.8
BINOWN= root
BINGRP= mail
BINMODE=2555
-WARNS?= 6
.include <bsd.prog.mk>
View
2  libexec/makekey/Makefile
@@ -1,9 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/makekey/Makefile,v 1.11.2.1 2001/04/25 10:40:52 ru Exp $
-# $DragonFly: src/libexec/makekey/Makefile,v 1.3 2005/02/15 19:49:06 cpressey Exp $
PROG= makekey
-WARNS?= 6
MAN= makekey.8
DPADD+= ${LIBCRYPT}
View
2  libexec/mknetid/Makefile
@@ -1,9 +1,7 @@
# $FreeBSD: src/libexec/mknetid/Makefile,v 1.4.2.2 2001/08/21 16:45:16 ru Exp $
-# $DragonFly: src/libexec/mknetid/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
PROG= mknetid
SRCS= mknetid.c hash.c parse_group.c
-WARNS?= 6
MAN= netid.5 mknetid.8
View
3  libexec/pppoed/Makefile
@@ -1,9 +1,6 @@
# $FreeBSD: src/libexec/pppoed/Makefile,v 1.1.6.1 2001/04/25 10:40:54 ru Exp $
-# $DragonFly: src/libexec/pppoed/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
PROG= pppoed
-SRCS= pppoed.c
-WARNS?= 6
DPADD= ${LIBNETGRAPH}
LDADD= -lnetgraph
MAN= pppoed.8
View
2  libexec/rbootd/Makefile
@@ -1,9 +1,9 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/rbootd/Makefile,v 1.9.2.1 2001/04/25 10:40:54 ru Exp $
-# $DragonFly: src/libexec/rbootd/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
PROG= rbootd
SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
MAN= rbootd.8
+WARNS?= 2
.include <bsd.prog.mk>
View
6 libexec/rbootd/rmpproto.c
@@ -45,7 +45,6 @@
*
* @(#)rmpproto.c 8.1 (Berkeley) 6/4/93
* $FreeBSD: src/libexec/rbootd/rmpproto.c,v 1.6.2.1 2001/02/18 02:54:11 kris Exp $
- * $DragonFly: src/libexec/rbootd/rmpproto.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
*/
#include <sys/param.h>
@@ -338,7 +337,10 @@ SendBootRepl(req, rconn, filelist)
* stripped file name and spoof the client into thinking that it
* really got what it wanted.
*/
- filename = (filename = strrchr(filepath,'/'))? ++filename: filepath;
+ if ((filename = strrchr(filepath, '/')) != NULL)
+ filename++;
+ else
+ filename = filepath;
/*
* Check that this is a valid boot file name.
View
3  libexec/rbootd/utils.c
@@ -45,7 +45,6 @@
*
* @(#)utils.c 8.1 (Berkeley) 6/4/93
* $FreeBSD: src/libexec/rbootd/utils.c,v 1.5 1999/08/28 00:09:46 peter Exp $
- * $DragonFly: src/libexec/rbootd/utils.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
*/
#include <sys/param.h>
@@ -163,7 +162,7 @@ DispPkt(rconn, direct)
GETWORD(rmp->r_rrpl.rmp_offset, t);
(void) fprintf(DbgFp, ReadFmt, rmp->r_rrpl.rmp_retcode,
t, ntohs(rmp->r_rrpl.rmp_session));
- (void) fprintf(DbgFp, "\t\tNoOfBytesSent: %d\n",
+ (void) fprintf(DbgFp, "\t\tNoOfBytesSent: %zd\n",
rconn->rmplen - RMPREADSIZE(0));
break;
case RMP_BOOT_DONE: /* boot complete */
View
5 libexec/revnetgroup/Makefile
@@ -1,10 +1,7 @@
# $FreeBSD: src/libexec/revnetgroup/Makefile,v 1.4.2.1 2001/04/25 10:40:54 ru Exp $
-# $DragonFly: src/libexec/revnetgroup/Makefile,v 1.3 2008/11/19 17:46:55 swildner Exp $
PROG= revnetgroup
SRCS= revnetgroup.c hash.c parse_netgroup.c
-WARNS?= 6
-
-MAN= revnetgroup.8
+MAN= revnetgroup.8
.include <bsd.prog.mk>
View
2  libexec/rlogind/Makefile
@@ -1,10 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/rlogind/Makefile,v 1.15.2.3 2001/04/25 10:40:55 ru Exp $
-# $DragonFly: src/libexec/rlogind/Makefile,v 1.3 2007/03/24 21:29:06 swildner Exp $
PROG= rlogind
MAN= rlogind.8
-WARNS?= 6
DPADD= ${LIBUTIL}
LDADD= -lutil
View
3  libexec/rpc.rquotad/Makefile
@@ -1,10 +1,7 @@
# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.4.2.1 2001/04/25 10:40:56 ru Exp $
-# $DragonFly: src/libexec/rpc.rquotad/Makefile,v 1.3 2008/11/19 18:41:30 swildner Exp $
PROG = rpc.rquotad
SRCS = rquotad.c
-WARNS?= 6
-
MAN = rpc.rquotad.8
DPADD= ${LIBRPCSVC}
View
2  libexec/rpc.rstatd/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD: src/libexec/rpc.rstatd/Makefile,v 1.5.2.1 2001/04/25 10:40:56 ru Exp $
-# $DragonFly: src/libexec/rpc.rstatd/Makefile,v 1.3 2004/12/22 11:01:49 joerg Exp $
PROG = rpc.rstatd
SRCS = rstatd.c rstat_proc.c
MAN = rpc.rstatd.8
+WARNS?= 2
DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKINFO}
LDADD= -lrpcsvc -lutil -ldevstat -lkinfo
View
5 libexec/rpc.rstatd/rstat_proc.c
@@ -29,7 +29,6 @@
* @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
* @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC
* $FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.14.2.1 2002/07/11 17:17:56 alfred Exp $
- * $DragonFly: src/libexec/rpc.rstatd/rstat_proc.c,v 1.5 2005/01/31 21:20:58 joerg Exp $
*/
/*
@@ -38,7 +37,6 @@
* Copyright (c) 1984 by Sun Microsystems, Inc.
*/
-#include <sys/kinfo.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
@@ -48,6 +46,7 @@
#include <err.h>
#include <fcntl.h>
+#include <kinfo.h>
#include <limits.h>
#include <signal.h>
#include <stdio.h>
@@ -85,7 +84,7 @@ union {
} stats_all;
void updatestat();
-static stat_is_init = 0;
+static int stat_is_init = 0;
#ifndef FSCALE
#define FSCALE (1 << 8)
View
8 libexec/rpc.rusersd/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD: src/libexec/rpc.rusersd/Makefile,v 1.6.2.1 2001/04/25 10:40:57 ru Exp $
-# $DragonFly: src/libexec/rpc.rusersd/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
-PROG = rpc.rusersd
-SRCS = rusersd.c rusers_proc.c
-MAN = rpc.rusersd.8
+PROG= rpc.rusersd
+SRCS= rusersd.c rusers_proc.c
+MAN= rpc.rusersd.8
+WARNS?= 2
DPADD= ${LIBRPCSVC} ${LIBUTIL}
LDADD= -lrpcsvc -lutil
View
8 libexec/rpc.rwalld/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD: src/libexec/rpc.rwalld/Makefile,v 1.4.2.1 2001/04/25 10:40:57 ru Exp $
-# $DragonFly: src/libexec/rpc.rwalld/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
-PROG = rpc.rwalld
-SRCS = rwalld.c
-MAN = rpc.rwalld.8
+PROG= rpc.rwalld
+SRCS= rwalld.c
+MAN= rpc.rwalld.8
+WARNS?= 2
DPADD= ${LIBRPCSVC} ${LIBUTIL}
LDADD= -lrpcsvc -lutil
View
8 libexec/rpc.sprayd/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD: src/libexec/rpc.sprayd/Makefile,v 1.4.2.1 2001/04/25 10:40:59 ru Exp $
-# $DragonFly: src/libexec/rpc.sprayd/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $
-PROG = rpc.sprayd
-SRCS = sprayd.c
-MAN = rpc.sprayd.8
+PROG= rpc.sprayd
+SRCS= sprayd.c
+MAN= rpc.sprayd.8
+WARNS?= 2
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
View
2  libexec/rshd/Makefile
@@ -1,10 +1,8 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/rshd/Makefile,v 1.15.2.3 2001/04/25 10:40:59 ru Exp $
-# $DragonFly: src/libexec/rshd/Makefile,v 1.3 2007/03/24 21:52:14 swildner Exp $
PROG= rshd
MAN= rshd.8
-WARNS?= 6
#CFLAGS+= -DCRYPT
View
3  libexec/rtld-elf/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.10.2.6 2002/06/22 17:03:13 jdp Exp $
-# $DragonFly: src/libexec/rtld-elf/Makefile,v 1.12 2005/11/19 22:00:20 joerg Exp $
PROG= ld-elf.so.2
SRCS= rtld_start.S rtld.c lockdflt.c map_object.c malloc.c \
xmalloc.c debug.c reloc.c
MAN= rtld.1
+WARNS?= 2
+
CFLAGS+= -Wall -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} -D__thread=
LDFLAGS+= -nostdlib -e .rtld_start -Wl,--no-undefined
INSTALLFLAGS= -C -b
View
3  libexec/smrsh/Makefile
@@ -1,6 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 7/2/95
# $FreeBSD: src/libexec/smrsh/Makefile,v 1.1.6.6 2002/03/25 21:31:40 gshapiro Exp $
-# $DragonFly: src/libexec/smrsh/Makefile,v 1.9 2007/04/14 17:43:48 gshapiro Exp $
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14
.PATH: ${SENDMAIL_DIR}/smrsh
@@ -8,6 +7,8 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14
PROG= smrsh
SRCS= smrsh.c
MAN= smrsh.8
+WARNS?= 2
+
CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I.
.if exists(${.OBJDIR}/../../lib/libsm)
View
8 libexec/talkd/Makefile
@@ -1,11 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/talkd/Makefile,v 1.6.2.2 2001/10/18 12:30:42 des Exp $
-# $DragonFly: src/libexec/talkd/Makefile,v 1.2 2003/06/17 04:27:08 dillon Exp $
+
+.PATH: ${.CURDIR}/../../usr.bin/wall
PROG= ntalkd
-CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c
-.PATH: ${.CURDIR}/../../usr.bin/wall
MAN= talkd.8
+WARNS?= 1
+
+CFLAGS+=-I${.CURDIR}/../../usr.bin/wall
.include <bsd.prog.mk>
View
3  libexec/tcpd/Makefile
@@ -1,8 +1,9 @@
# $FreeBSD: src/libexec/tcpd/Makefile,v 1.1.2.1 2002/08/31 18:43:41 dwmalone Exp $
-# $DragonFly: src/libexec/tcpd/Makefile,v 1.3 2004/01/31 06:56:40 dillon Exp $
PROG= tcpd
MAN= tcpd.8
+WARNS?= 1
+
CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
View
4 libexec/telnetd/Makefile
@@ -1,5 +1,4 @@
# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $
-# $DragonFly: src/libexec/telnetd/Makefile,v 1.2 2003/06/17 04:27:08 dillon Exp $
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.
@@ -10,8 +9,7 @@ MAN= telnetd.8
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c
-WARNS?= 0
-WFORMAT?= 0
+WARNS?= 2
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK \
-I${.CURDIR}/../../lib
View
6 libexec/tftpd/Makefile
@@ -1,13 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD: src/libexec/tftpd/Makefile,v 1.7.2.1 2001/04/25 10:41:03 ru Exp $
-# $DragonFly: src/libexec/tftpd/Makefile,v 1.2 2003/06/17 04:27:08 dillon Exp $
PROG= tftpd
SRCS= tftpd.c tftpsubs.c
-WARNS?= 6
+MAN= tftpd.8
+
DPADD= ${LIBUTIL}
LDADD= -lutil
-MAN= tftpd.8
+
CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp
.PATH: ${.CURDIR}/../../usr.bin/tftp
View
3  libexec/xtend/Makefile
@@ -1,11 +1,12 @@
# Makefile for xtend (Stark) 10/30/93
# $FreeBSD: src/libexec/xtend/Makefile,v 1.7.2.1 2001/04/25 10:41:03 ru Exp $
-# $DragonFly: src/libexec/xtend/Makefile,v 1.2 2003/06/17 04:27:08 dillon Exp $
BINMODE= 555
PROG= xtend
SRCS= xtend.c status.c packet.c user.c
+WARNS?= 1
+
CFLAGS+= -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\"
DPADD= ${LIBUTIL}
LDADD= -lutil
Please sign in to comment.
Something went wrong with that request. Please try again.