From 05e71e804e84db60e7af4077cd4840d1335c2d71 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 14 Nov 1996 03:18:52 +0000
Subject: [PATCH] now builds even with broken makes

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@953 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/common/Makefile.in       | 18 +++++++++++++-----
 appl/ftp/ftp/Makefile.in          | 26 +++++++++++++++++++-------
 appl/ftp/ftpd/Makefile.in         |  7 +++++++
 appl/telnet/libtelnet/Makefile.in |  3 +++
 appl/telnet/telnet/Makefile.in    |  5 ++++-
 appl/telnet/telnetd/Makefile.in   |  5 +++--
 lib/des/Makefile.in               |  3 +++
 lib/roken/Makefile.in             |  7 +++++++
 8 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in
index ef733d44d..3dcb30bd4 100644
--- a/appl/ftp/common/Makefile.in
+++ b/appl/ftp/common/Makefile.in
@@ -1,12 +1,13 @@
 # $Id$
 
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-VPATH=@srcdir@
-
 SHELL		= /bin/sh
 
+srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
+VPATH		= @srcdir@
+
 CC 	= @CC@
+AR	= ar
 RANLIB 	= @RANLIB@
 DEFS 	= @DEFS@
 CFLAGS 	= @CFLAGS@
@@ -17,6 +18,9 @@ prefix 	= @prefix@
 exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 
+SOURCES = base64.c glob.c
+OBJECTS = $(libcommon_OBJS)
+
 libcommon_OBJS = base64.o glob.o
 
 all: libcommon.a
@@ -28,11 +32,15 @@ libcommon.a: $(libcommon_OBJS)
 	ar cr libcommon.a $(libcommon_OBJS)
 	$(RANLIB) libcommon.a
 
-
 install:
 
+TAGS: $(SOURCES)
+	etags $(SOURCES)
+
 clean cleandir:
 	rm -f *~ *.o libcommon.a core \#*
 
 distclean: 
 	rm -f Makefile
+
+$(OBJECTS): ../../../config.h
diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
index d19f89b06..a914d0cdb 100644
--- a/appl/ftp/ftp/Makefile.in
+++ b/appl/ftp/ftp/Makefile.in
@@ -2,18 +2,18 @@
 # $Id$
 #
 
+SHELL		= /bin/sh
+
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 VPATH		= @srcdir@
 
-SHELL		= /bin/sh
-
 CC 	= @CC@
 RANLIB 	= @RANLIB@
 DEFS 	= @DEFS@
 CFLAGS 	= @CFLAGS@
 LD_FLAGS = @LD_FLAGS@
-LIBS = @LIBS@
+LIBS	 = @LIBS@
 MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
 
 INSTALL = @INSTALL@
@@ -30,9 +30,16 @@ LIBTOP = $(ATHENA)/lib
 
 PROGS = ftp
 
-ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o globals.o kauth.o
+ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o \
+	globals.o kauth.o
 
-all: ftp
+ftp_SOURCES = cmds.c cmdtab.c ftp.c krb4.c main.c ruserpass.c \
+	domacro.c globals.c kauth.c
+
+OBJECTS = $(ftp_OBJS)
+SOURCES = $(ftp_SOURCES)
+
+all: $(PROGS)
 
 .c.o:
 	$(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $<
@@ -41,11 +48,16 @@ install: all
 	$(MKINSTALLDIRS) $(prefix)/bin
 	for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
 
-ftp: $(ftp_OBJS) ../common/libcommon.a
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftp $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
+ftp: $(ftp_OBJS) # ../common/libcommon.a
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
+
+TAGS: $(SOURCES)
+	etags $(SOURCES)
 
 clean cleandir:
 	rm -f *~ *.o core ftp \#*
 
 distclean: 
 	rm -f Makefile
+
+$(OBJECTS): ../../../config.h
diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index c180309d8..304554651 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -40,8 +40,12 @@ LIBROKEN= $(LIBTOP)/roken/libroken.a
 
 PROGS = ftpd
 
+ftpd_SOURCES = ftpd.c ftpcmd.c logwtmp.c popen.c auth.c krb4.c kauth.c
 ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o
 
+SOURCES = $(ftpd_SOURCES)
+OBJECTS = $(ftpd_OBJS)
+
 all: ftpd
 
 .c.o:
@@ -60,6 +64,9 @@ ftpcmd.c: ftpcmd.y
 	chmod a-w y.tab.c
 	mv -f y.tab.c ftpcmd.c
 
+TAGS: $(SOURCES)
+	etags $(SOURCES)
+
 clean cleandir:
 	rm -f *~ *.o core ftpd ftpcmd.c \#*
 
diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in
index d83dd1c93..835bf8a74 100644
--- a/appl/telnet/libtelnet/Makefile.in
+++ b/appl/telnet/libtelnet/Makefile.in
@@ -35,6 +35,9 @@ libtelnet.a: $(OBJECTS)
 install:
 	@true
 
+TAGS: $(SOURCES)
+	etags $(SOURCES)
+
 clean cleandir:
 	rm -f *.o *.a \#* *~ core
 
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index bf356dcd3..00c40c0a9 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -22,7 +22,7 @@ prefix = @prefix@
 exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 
-SOURCES=commands.c main.c network.c ring.c \
+SOURCES=authenc.c commands.c main.c network.c ring.c \
 	sys_bsd.c telnet.c terminal.c \
 	utilities.c $(GETOPT_SRC)
 
@@ -51,6 +51,9 @@ install: all
 	$(MKINSTALLDIRS) $(prefix)/bin
 	for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
 
+TAGS: $(SOURCES)
+	etags $(SOURCES)
+
 clean cleandir:
 	rm -f *.o *.a telnet \#* *~ core
 
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index 189246872..78e9c0d49 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -28,11 +28,9 @@ PROGS = telnetd
 SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \
 	utility.c global.c authenc.c
 
-
 OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \
 	utility.o global.o authenc.o
 
-
 libtop = @libtop@
 
 LIBKRB		= -L../../../lib/krb -lkrb
@@ -55,6 +53,9 @@ install: all
 	$(MKINSTALLDIRS) $(prefix)/libexec
 	for x in $(PROGS); do $(INSTALL) $$x $(prefix)/libexec; done
 
+TAGS: $(SOURCES)
+	etags $(SOURCES)
+
 clean cleandir:
 	rm -f *.o *.a telnetd \#* *~ core
 
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 5392a607c..030b7f1d2 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -58,6 +58,9 @@ rpw.o: rpw.c
 speed.o: speed.c
 	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
 
+mdtest.o: mdtest.c
+	$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
+
 install: all
 	$(MKINSTALLDIRS) $(libdir)
 	$(INSTALL) -m 0555 $(LIB) $(libdir)
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index da3a90c3b..f2261a773 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -31,6 +31,13 @@ SHLIBEXT = @SHLIBEXT@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
+SOURCES = err.c errx.c getcwd.c getdtablesize.c getent.c getopt.c \
+	getusershell.c herror.c hstrerror.c inaddr2str.c inet_aton.c \
+	k_getpwnam.c k_getpwuid.c memmove.c mini_inetd.c putenv.c setegid.c \
+	setenv.c seteuid.c signal.c strcasecmp.c strchr.c strdup.c strerror.c \
+	strftime.c strnlen.c strrchr.c tm2time.c unsetenv.c verify.c verr.c \
+	verrx.c vsyslog.c vwarn.c vwarnx.c warn.c warnx.c
+
 OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \
 	  verify.o inaddr2str.o mini_inetd.o \
 	  @LIBOBJS@