summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2001-11-30 21:10:58 +0000
committermarkm <markm@FreeBSD.org>2001-11-30 21:10:58 +0000
commit7f33af3e59446f387cb44615881c175d92320581 (patch)
treee1cbbe5dfa994edf9086841d6eb68fe87b446aca
parent4be6f18d14314b6a5e0e878e13a1fe937886cf0f (diff)
downloadFreeBSD-src-7f33af3e59446f387cb44615881c175d92320581.zip
FreeBSD-src-7f33af3e59446f387cb44615881c175d92320581.tar.gz
Clean up makefiles, and turn on WARNS=2. Take into account the telnet
#if cleanup.
-rw-r--r--secure/lib/libtelnet/Makefile6
-rw-r--r--secure/libexec/telnetd/Makefile6
-rw-r--r--secure/usr.bin/telnet/Makefile16
3 files changed, 17 insertions, 11 deletions
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index c229e6b..b964e16 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -9,8 +9,10 @@ NOPIC= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
-CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
- -DSRA -I${TELNETDIR}
+CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \
+ -I${TELNETDIR} -I${TELNETDIR}/libtelnet
+
+WARNS?= 2
INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 24e3731..ef9d1b2 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -6,12 +6,14 @@
PROG= telnetd
MAN= telnetd.8
+SRCS= global.c slc.c state.c sys_term.c telnetd.c \
+ termstat.c utility.c authenc.c
+
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-I${TELNETDIR} -DINET6
-SRCS= global.c slc.c state.c sys_term.c telnetd.c \
- termstat.c utility.c authenc.c
+WARNS?= 2
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
${LIBCRYPT} ${LIBPAM}
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index dd900b7d..74cf075 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -2,17 +2,19 @@
PROG= telnet
+SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
+ telnet.c terminal.c utilities.c
+
CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
- -I${TELNETDIR}
+ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/
-SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
- telnet.c terminal.c tn3270.c utilities.c
+WARNS?= 2
-DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
- ${LIBIPSEC} ${LIBPAM}
-LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
- -lipsec ${MINUSLPAM}
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
+LDADD= -ltermcap ${LIBTELNET} -lmp \
+ -lcrypto -lcrypt -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud