summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Kohl <jtkohl@mit.edu>1991-02-18 10:31:53 +0000
committerJohn Kohl <jtkohl@mit.edu>1991-02-18 10:31:53 +0000
commit5259f9daf6b3191d16e2a4fec4661e19f29bb769 (patch)
tree65ebd281a1de957a9518c3554b1bf854130b9b02 /src
parenteea74f39c83979b2fca8fd28998dbe04ab606f8e (diff)
downloadkrb5-5259f9daf6b3191d16e2a4fec4661e19f29bb769.tar.gz
krb5-5259f9daf6b3191d16e2a4fec4661e19f29bb769.tar.xz
krb5-5259f9daf6b3191d16e2a4fec4661e19f29bb769.zip
rearrange lib linking stuff
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1717 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/config/Project.tmpl21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index d86127f63..24efc6b6b 100644
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -266,22 +266,25 @@ P_PROTOS=-UUseNarrowPrototypes
UNIFDEFSRC = $(TOP)/util/unifdef
TOPLIBD = $(TOP)/lib
OSLIB = os
+ OSDEPLIB = $(TOPLIBD)/libos.a
DESLIB = des5
+ DESDEPLIB = $(TOPLIBD)/libdes5.a
RSAMD4LIB = md4
+ RSAMD4DEPLIB = $(TOPLIBD)/libmd4.a
KRB5LIB = krb5
+ KRB5DEPLIB = $(TOPLIBD)/libkrb5.a
CRCLIB = crc32
- MD4LIB = md4
+ CRCDEPLIB = $(TOPLIBD)/libcrc32.a
ISODELIB = IsodeLib
DBMLIB = DbmLib
- DEPKLIB = $(TOPLIBD)/lib$(KRB5LIB).a $(TOPLIBD)/lib$(RSAMD4LIB).a $(TOPLIBD)/lib$(DESLIB).a $(TOPLIBD)/lib$(OSLIB).a $(TOPLIBD)/lib$(CRCLIB).a
- KLIB = -L$(TOPLIBD) -l$(KRB5LIB) -l$(RSAMD4LIB) -l$(DESLIB) -l$(OSLIB) -l$(CRCLIB) $(ISODELIB) $(COMERRLIB) $(DBMLIB)
- DEPKDBLIB = $(TOPLIBD)/libkdb.a
-/* ideally, this would be just "kdb", but since it needs to load before
- the other libs, it misses th e -L$(TOPLIBD) */
- KDBLIB = $(DEPKDBLIB)
- DEPKRB425LIB = $(TOPLIBD)/libkrb425.a
- KRB425LIB = $(DEPKDBLIB)
+ DEPKLIB = $(KRB5DEPLIB) $(RSAMD4DEPLIB) $(DESDEPLIB) $(OSDEPLIB) $(CRCDEPLIB)
+ KLIBLOC = -L$(TOPLIBD)
+ KLIB = $(KLIBLOC) -l$(KRB5LIB) -l$(RSAMD4LIB) -l$(DESLIB) -l$(OSLIB) -l$(CRCLIB) $(ISODELIB) $(COMERRLIB) $(DBMLIB)
+ KDBDEPLIB = $(TOPLIBD)/libkdb.a
+ KDBLIB = $(KLIBLOC) -lkdb
+ KRB425DEPLIB = $(TOPLIBD)/libkrb425.a
+ KRB425LIB = $(KRB425DEPLIB)
KRB4LIB = Krb4LibList
KRB4INCLUDES = Krb4Includes