From 724f0db304180ef90384150111317bb22b0116d7 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sat, 7 Mar 1998 18:01:47 +0000
Subject: [PATCH] Changes to make this work with new `--disable-dynamic-afs'
 option to configure, and hopefully AIX 3.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4558 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kafs/Makefile.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index 5dd269951..ba82fc79f 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -10,7 +10,7 @@ VPATH = @srcdir@
 CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
-DEFS = @DEFS@ -DLIBDIR='"$(libdir)"'
+DEFS = @DEFS@ -DLIBDIR='"$(libdir)"' @AFS_EXTRA_DEFS@
 CFLAGS = @CFLAGS@
 
 INSTALL = @INSTALL@
@@ -28,12 +28,13 @@ LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
 LIBPREFIX = @LIBPREFIX@
 LDSHARED = @LDSHARED@
+AFS_EXTRA_OBJS	= @AFS_EXTRA_OBJS@
 AFS_EXTRA_LIBS	= @AFS_EXTRA_LIBS@
 LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
 
 SOURCES = afssys.c afskrb.c common.c afslib.c
 
-OBJECTS = afssys.o afskrb.o common.o
+OBJECTS = afssys.o afskrb.o common.o $(AFS_EXTRA_OBJS)
 
 all: $(LIB)
 
@@ -76,9 +77,9 @@ dist: $(DISTFILES)
 	    || cp -p $$file ../`cat ../.fname`/lib; \
 	done
 
-$(LIBNAME).a: $(OBJECTS) @AFS_EXTRA_OBJS@
+$(LIBNAME).a: $(OBJECTS)
 	rm -f $@
-	$(AR) cr $@ $(OBJECTS) @AFS_EXTRA_OBJS@
+	$(AR) cr $@ $(OBJECTS)
 	-$(RANLIB) $@
 
 
@@ -89,6 +90,6 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 # AIX: this almost works with gcc, but somehow it fails to use the
 # correct ld, use ld instead
 afslib.so: afslib.o
-	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp -bnoentry afslib.o
+	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp @AFS_EXTRA_LD@ afslib.o
 
 $(OBJECTS): ../../include/config.h