From 518172f2269050d6e39896723b20281f5f5cfbc4 Mon Sep 17 00:00:00 2001 From: Unknown User d91-jda Date: Wed, 19 Jul 1995 23:47:00 +0000 Subject: [PATCH] Added support for autoconf git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@57 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/Makefile.in | 26 +++++++++++++-------- appl/telnet/libtelnet/Makefile.in | 32 +++++++++++++++++--------- appl/telnet/libtelnet/auth.c | 1 + appl/telnet/libtelnet/enc_des.c | 6 +++-- appl/telnet/libtelnet/encrypt.c | 2 ++ appl/telnet/libtelnet/kerberos.c | 2 ++ appl/telnet/libtelnet/kerberos5.c | 1 + appl/telnet/libtelnet/krb4encpwd.c | 1 + appl/telnet/libtelnet/misc.c | 2 ++ appl/telnet/libtelnet/read_password.c | 2 ++ appl/telnet/libtelnet/rsaencpwd.c | 1 + appl/telnet/libtelnet/spx.c | 2 ++ appl/telnet/telnet/authenc.c | 2 ++ appl/telnet/telnet/commands.c | 6 ++++- appl/telnet/telnet/main.c | 2 ++ appl/telnet/telnet/network.c | 2 ++ appl/telnet/telnet/ring.c | 2 ++ appl/telnet/telnet/sys_bsd.c | 2 ++ appl/telnet/telnet/telnet.c | 3 +++ appl/telnet/telnet/terminal.c | 2 ++ appl/telnet/telnet/utilities.c | 2 ++ appl/telnet/telnetd/Makefile.in | 33 ++++++++++++++++++--------- appl/telnet/telnetd/authenc.c | 2 ++ appl/telnet/telnetd/global.c | 2 ++ appl/telnet/telnetd/slc.c | 2 ++ appl/telnet/telnetd/state.c | 2 ++ appl/telnet/telnetd/telnetd.c | 2 ++ appl/telnet/telnetd/termstat.c | 2 ++ 28 files changed, 111 insertions(+), 35 deletions(-) diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in index e04ad07fb..ffb6fb69b 100644 --- a/appl/telnet/Makefile.in +++ b/appl/telnet/Makefile.in @@ -6,21 +6,27 @@ VPATH = @srcdir@ SHELL = /bin/sh CC = @CC@ -AR = ar RANLIB = @RANLIB@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ -prefix = /usr/local +INSTALL = @INSTALL@ +prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -all: - cd libtelnet; make CC="${CC}" - cd telnet; make CC="${CC}" - cd telnetd; make CC="${CC}" +SUBDIRS=libtelnet telnet telnetd + +all: + for i in $(SUBDIRS); \ + do (cd $$i; $(MAKE) $(MFLAGS) all); done + +.PHONY: configure + +configure: + $(srcdir)/configure + +clean cleandir: + for i in $(SUBDIRS); \ + do (cd $$i; $(MAKE) $(MFLAGS) clean); done -.DEFAULT: - cd libtelnet; make $@ WHAT=${WHAT} CC="${CC}" - cd telnet; make $@ WHAT=${WHAT} CC="${CC}" - cd telnetd; make $@ WHAT=${WHAT} CC="${CC}" diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index 1874b9579..d17ddae1e 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -9,22 +9,32 @@ CC = @CC@ AR = ar RANLIB = @RANLIB@ DEFS = @DEFS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ -I/usr/athena/include -I.. -I$(VPATH)/.. -prefix = /usr/local +prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -# -# Everything happens in ../Makefile.config and Makefile.generic -# -SHELL=/bin/sh +LIBOBJS=@LIBOBJS@ -all: - $(MAKE) -f $(VPATH)/../Config.local WHAT=${WHAT} CC="${CC}" VPATH=${VPATH} MAKE="${MAKE}"; \ +SOURCES=auth.c encrypt.c genget.c \ + misc.c kerberos.c kerberos5.c forward.c spx.c enc_des.c \ + rsaencpwd.c krb4encpwd.c read_password.c \ + setenv.c getent.c strdup.c strcasecmp.c \ + strchr.c strrchr.c strftime.c strerror.c -.DEFAULT: - $(MAKE) -f $(VPATH)/../Config.local WHAT=${WHAT} CC="${CC}" VPATH=${VPATH} $@ MAKE="${MAKE}"; \ + +OBJECTS=auth.o encrypt.o genget.o \ + misc.o kerberos.o kerberos5.o forward.o spx.o enc_des.o \ + rsaencpwd.o krb4encpwd.o read_password.o \ + $(LIBOBJS) + +all: libtelnet.a + + +libtelnet.a: $(OBJECTS) + $(AR) cr libtelnet.a $(OBJECTS) + $(RANLIB) libtelnet.a clean cleandir: - rm -f *.o *.a telnet telnetd core + rm -f *.o *.a \#* *~ core diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c index 6d42fa9cf..cedd1f9ea 100644 --- a/appl/telnet/libtelnet/auth.c +++ b/appl/telnet/libtelnet/auth.c @@ -55,6 +55,7 @@ static char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; * or implied warranty. */ +#include #if defined(AUTHENTICATION) #include diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c index 02b6bcb84..ceeabff9a 100644 --- a/appl/telnet/libtelnet/enc_des.c +++ b/appl/telnet/libtelnet/enc_des.c @@ -39,6 +39,8 @@ static char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; static char orig_sccsid[] = "@(#)enc_des.c 5.1 (Berkeley) 3/22/91"; #endif /* not lint */ +#include + #if defined(AUTHENTICATION) && defined(ENCRYPTION) && defined(DES_ENCRYPTION) #include #include @@ -114,10 +116,10 @@ struct keyidlist { void fb64_stream_iv P((Block, struct stinfo *)); void fb64_init P((struct fb *)); -int fb64_start P((struct fb *, int, int)); +static int fb64_start P((struct fb *, int, int)); int fb64_is P((unsigned char *, int, struct fb *)); int fb64_reply P((unsigned char *, int, struct fb *)); -void fb64_session P((Session_Key *, int, struct fb *)); +static void fb64_session P((Session_Key *, int, struct fb *)); void fb64_stream_key P((Block, struct stinfo *)); int fb64_keyid P((int, unsigned char *, int *, struct fb *)); diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c index a7b2c610e..10464460e 100644 --- a/appl/telnet/libtelnet/encrypt.c +++ b/appl/telnet/libtelnet/encrypt.c @@ -60,6 +60,8 @@ static char orig_sccsid[] = "@(#)encrypt.c 5.2 (Berkeley) 3/22/91"; */ +#include + #if defined(ENCRYPTION) #define ENCRYPT_NAMES diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c index ff05083b0..3949c0354 100644 --- a/appl/telnet/libtelnet/kerberos.c +++ b/appl/telnet/libtelnet/kerberos.c @@ -55,6 +55,8 @@ static char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95"; * or implied warranty. */ +#include + #ifdef KRB4 #include #include diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c index 4c39ab9b7..669fc0396 100644 --- a/appl/telnet/libtelnet/kerberos5.c +++ b/appl/telnet/libtelnet/kerberos5.c @@ -69,6 +69,7 @@ static char sccsid[] = "@(#)kerberos5.c 8.3 (Berkeley) 5/30/95"; * or implied warranty. */ +#include #ifdef KRB5 #include diff --git a/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c index ddef324f2..432dac61c 100644 --- a/appl/telnet/libtelnet/krb4encpwd.c +++ b/appl/telnet/libtelnet/krb4encpwd.c @@ -35,6 +35,7 @@ static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#include #ifdef KRB4_ENCPWD /* diff --git a/appl/telnet/libtelnet/misc.c b/appl/telnet/libtelnet/misc.c index 05caf2711..e54b64c30 100644 --- a/appl/telnet/libtelnet/misc.c +++ b/appl/telnet/libtelnet/misc.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint */ +#include + #include "misc.h" char *RemoteHostName; diff --git a/appl/telnet/libtelnet/read_password.c b/appl/telnet/libtelnet/read_password.c index 5a43faf57..f3679e317 100644 --- a/appl/telnet/libtelnet/read_password.c +++ b/appl/telnet/libtelnet/read_password.c @@ -50,6 +50,8 @@ static char sccsid[] = "@(#)read_password.c 8.3 (Berkeley) 5/30/95"; * echoing. */ +#include + #if defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) #include diff --git a/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c index 5906d999a..68c4cd712 100644 --- a/appl/telnet/libtelnet/rsaencpwd.c +++ b/appl/telnet/libtelnet/rsaencpwd.c @@ -35,6 +35,7 @@ static char sccsid[] = "@(#)rsaencpwd.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#include #ifdef RSA_ENCPWD /* diff --git a/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c index 804be6d53..95277df34 100644 --- a/appl/telnet/libtelnet/spx.c +++ b/appl/telnet/libtelnet/spx.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)spx.c 8.2 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #ifdef SPX /* * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION diff --git a/appl/telnet/telnet/authenc.c b/appl/telnet/telnet/authenc.c index 44f2ba9c5..1f4efbf5b 100644 --- a/appl/telnet/telnet/authenc.c +++ b/appl/telnet/telnet/authenc.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ +#include + #if defined(AUTHENTICATION) || defined(ENCRYPTION) #include #include diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c index f9317b885..51771cdab 100644 --- a/appl/telnet/telnet/commands.c +++ b/appl/telnet/telnet/commands.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #if defined(unix) #include #if defined(CRAY) || defined(sysV88) @@ -56,6 +58,7 @@ static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #include #include #include +#include #include @@ -2009,7 +2012,8 @@ extern int EncryptStop P((char *)), EncryptStopInput P((void)), EncryptStopOutput P((void)), - EncryptStatus P((void)), + EncryptStatus P((void)); +static int EncryptHelp P((void)); struct encryptlist EncryptList[] = { diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c index c93feeeec..772a09728 100644 --- a/appl/telnet/telnet/main.c +++ b/appl/telnet/telnet/main.c @@ -41,6 +41,8 @@ static char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include #include "ring.h" diff --git a/appl/telnet/telnet/network.c b/appl/telnet/telnet/network.c index 7db5ae629..2d5328ab3 100644 --- a/appl/telnet/telnet/network.c +++ b/appl/telnet/telnet/network.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif /* not lint */ +#include + #include #include #include diff --git a/appl/telnet/telnet/ring.c b/appl/telnet/telnet/ring.c index 81e43e82a..70b90de84 100644 --- a/appl/telnet/telnet/ring.c +++ b/appl/telnet/telnet/ring.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + /* * This defines a structure for a ring buffer. * diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c index 281b8bd3f..c6859f628 100644 --- a/appl/telnet/telnet/sys_bsd.c +++ b/appl/telnet/telnet/sys_bsd.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + /* * The following routines try to encapsulate what is system dependent * (at least between 4.x and dos) which is used in telnet.c. diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c index d635944f1..0c23f6278 100644 --- a/appl/telnet/telnet/telnet.c +++ b/appl/telnet/telnet/telnet.c @@ -35,7 +35,10 @@ static char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include +#include #if defined(unix) #include diff --git a/appl/telnet/telnet/terminal.c b/appl/telnet/telnet/terminal.c index 317c838bc..d042c7b3b 100644 --- a/appl/telnet/telnet/terminal.c +++ b/appl/telnet/telnet/terminal.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif /* not lint */ +#include + #include #include diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c index e380bbf59..3c0d406ec 100644 --- a/appl/telnet/telnet/utilities.c +++ b/appl/telnet/telnet/utilities.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #define TELOPTS #define TELCMDS #define SLC_NAMES diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index 63e56991b..537f61a46 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -9,22 +9,33 @@ CC = @CC@ AR = ar RANLIB = @RANLIB@ DEFS = @DEFS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ -I/usr/athena/include -I.. -I$(VPATH)/.. +LIBS = @LIBS@ -prefix = /usr/local +prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -# -# Everything happens in ../Makefile.config and Makefile.generic -# -SHELL=/bin/sh +SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \ + utility.c global.c authenc.c -all: - make -f $(VPATH)/../Config.local WHAT=${WHAT} CC="${CC}" VPATH=${VPATH}; \ -.DEFAULT: - make -f $(VPATH)/../Config.local WHAT=${WHAT} CC="${CC}" VPATH=${VPATH} $@; \ +OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \ + utility.o global.o authenc.o + + +libtop=/usr/athena/lib + +KLIB=$(libtop)/kafs/libkafs.a $(libtop)/krb/libkrb.a $(libtop)/des/libdes.a + + +all: telnetd + +telnetd: $(OBJECTS) + $(CC) -o telnetd $(OBJECTS) $(LIBS) ../libtelnet/libtelnet.a $(KLIB) + clean cleandir: - rm -f *.o *.a telnet telnetd core + rm -f *.o *.a telnetd \#* *~ core + + diff --git a/appl/telnet/telnetd/authenc.c b/appl/telnet/telnetd/authenc.c index 8fb0c4fd5..b93268c4b 100644 --- a/appl/telnet/telnetd/authenc.c +++ b/appl/telnet/telnetd/authenc.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #if defined(AUTHENTICATION) || defined(ENCRYPTION) #include "telnetd.h" #include diff --git a/appl/telnet/telnetd/global.c b/appl/telnet/telnetd/global.c index af21acc69..34398513c 100644 --- a/appl/telnet/telnetd/global.c +++ b/appl/telnet/telnetd/global.c @@ -43,6 +43,8 @@ static char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; * we will actually allocate the space. */ +#include + #include "defs.h" #define extern #include "ext.h" diff --git a/appl/telnet/telnetd/slc.c b/appl/telnet/telnetd/slc.c index 6cbb7abab..125a7970d 100644 --- a/appl/telnet/telnetd/slc.c +++ b/appl/telnet/telnetd/slc.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include "telnetd.h" #ifdef LINEMODE diff --git a/appl/telnet/telnetd/state.c b/appl/telnet/telnetd/state.c index 36dc01752..a0f06ca67 100644 --- a/appl/telnet/telnetd/state.c +++ b/appl/telnet/telnetd/state.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include "telnetd.h" #if defined(AUTHENTICATION) #include diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c index 84291d460..c37d5ed4e 100644 --- a/appl/telnet/telnetd/telnetd.c +++ b/appl/telnet/telnetd/telnetd.c @@ -41,6 +41,8 @@ static char copyright[] = static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include "telnetd.h" #include "pathnames.h" diff --git a/appl/telnet/telnetd/termstat.c b/appl/telnet/telnetd/termstat.c index d3ed26537..b7c83833f 100644 --- a/appl/telnet/telnetd/termstat.c +++ b/appl/telnet/telnetd/termstat.c @@ -35,6 +35,8 @@ static char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif /* not lint */ +#include + #include "telnetd.h" /*