From 477bde3f3f9bb9bcbbd819ff6c82fb54959be1fb Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 4 Dec 1996 23:50:02 +0000
Subject: [PATCH] Link with roken before and after LIBS

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1085 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftp/Makefile.in        | 2 +-
 appl/ftp/ftpd/Makefile.in       | 2 +-
 appl/kx/Makefile.in             | 7 ++++---
 appl/otp/Makefile.in            | 7 ++++---
 appl/popper/Makefile.in         | 5 +++--
 appl/telnet/telnet/Makefile.in  | 4 ++--
 appl/telnet/telnetd/Makefile.in | 4 ++--
 appl/xnlock/Makefile.in         | 7 ++++---
 8 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in
index a914d0cdb..0b38271ec 100644
--- a/appl/ftp/ftp/Makefile.in
+++ b/appl/ftp/ftp/Makefile.in
@@ -49,7 +49,7 @@ install: all
 	for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
 
 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)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS) -L$(LIBTOP)/roken -lroken
 
 TAGS: $(SOURCES)
 	etags $(SOURCES)
diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in
index d7b9f5026..387f7aa04 100644
--- a/appl/ftp/ftpd/Makefile.in
+++ b/appl/ftp/ftpd/Makefile.in
@@ -56,7 +56,7 @@ install: all
 
 
 ftpd: $(ftpd_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 ftpcmd.c: ftpcmd.y
 	$(YACC) $(YFLAGS) $<
diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index 68527a504..48f293a07 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -77,13 +77,14 @@ dist: $(DISTFILES)
 	    || cp -p $$file ../`cat ../.fname`/lib; \
 	done
 
-KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
+KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes
+LIBROKEN=-L../../lib/roken -lroken
 
 kx: $(OBJECTS_KX)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 kxd: $(OBJECTS_KXD)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 rxterm: rxterm.in
 	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@
diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in
index a5507fa60..2b8ff1fb7 100644
--- a/appl/otp/Makefile.in
+++ b/appl/otp/Makefile.in
@@ -63,12 +63,13 @@ distclean: clean
 realclean: distclean
 	rm -f TAGS
 
-OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes -L../../lib/roken -lroken
+OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes
+LIBROKEN=-L../../lib/roken -lroken
 
 otp: $(OBJECTS_OTP)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 otpprint: $(OBJECTS_OTPPRINT)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../config.h
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index 6b7da1d85..7ed079f34 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -74,10 +74,11 @@ dist: $(DISTFILES)
 	    || cp -p $$file ../`cat ../.fname`/lib; \
 	done
 
-KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
+KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
+LIBROKEN=-L../../lib/roken -lroken
 OTPLIB=-L../../lib/otp -lotp
 
 popper: $(OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBS)
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../config.h
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index f657505fe..e5bb6207f 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -35,7 +35,7 @@ LIBKRB		= -L../../../lib/krb -lkrb
 LIBDES		= -L../../../lib/des -ldes
 LIBROKEN	= -L../../../lib/roken -lroken
 
-KLIB=$(LIBKRB) $(LIBDES) $(LIBROKEN)
+KLIB=$(LIBKRB) $(LIBDES)
 
 
 all: telnet
@@ -44,7 +44,7 @@ all: telnet
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $<
 
 telnet: $(OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) @LIB_tgetent@ @LIB_setupterm@
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN)
 
 install: all
 	$(MKINSTALLDIRS) $(prefix)/bin
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index 78e9c0d49..f4e92da4d 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -38,7 +38,7 @@ LIBDES		= -L../../../lib/des -ldes
 LIBKAFS		= @KRB_KAFS_LIB@
 LIBROKEN	= -L../../../lib/roken -lroken
 
-KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBROKEN)
+KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES)
 
 
 all: telnetd
@@ -47,7 +47,7 @@ all: telnetd
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $<
 
 telnetd: $(OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) @LIB_tgetent@
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
 
 install: all
 	$(MKINSTALLDIRS) $(prefix)/libexec
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index 843fe0c91..6e7f8a8ae 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -78,9 +78,10 @@ dist: $(DISTFILES)
 	    || cp -p $$file ../`cat ../.fname`/lib; \
 	done
 
-KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
+KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
+LIBROKEN=-L../../lib/roken -lroken
 
 xnlock: xnlock.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBS)
-
+	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+ 
 $(OBJECTS): ../../config.h