rearrange lib structure

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@873 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index 36957b7375ffa272cc1c2f723afe6178b6a2042f..9552ac20c9ac73529a0b07a451c097f835ea98d6 100644 (file)
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -114,14 +114,16 @@ libdir/lib/**/libname.a:                                          @@\
             TOUCH = TouchCmd
             ETSRC = $(TOP)/lib/comerr/compile_et
          SSCMDSRC = $(TOP)/lib/ss/mk_cmds
-          DEPKLIB = $(TOP)/lib/libkrb5.a \
-                    $(TOP)/lib/os-4.3/libos.a \
-                    $(TOP)/lib/des_new/libdes.a \
-                    $(TOP)/lib/crc-32/libcrc32.a
-
-             KLIB = $(DEPKLIB) $(ISODE)/@sys/lib/libisode.a -lcom_err
+            OSLIB = $(TOP)/lib/os/libos.a
+           DESLIB = $(TOP)/lib/des/libdes.a
+          KRB5LIB = $(TOP)/lib/libkrb5.a
+           CRCLIB = $(TOP)/lib/crc-32/libcrc32.a
+         ISODELIB = $(ISODE)/@sys/lib/libisode.a
+
+          DEPKLIB = $(KRB5LIB) $(OSLIB) $(DESLIB) $(CRCLIB)
+             KLIB = $(DEPKLIB) $(ISODELIB) -lcom_err
         DEPKDBLIB = $(TOP)/lib/kdb/libkdb.a
-           KDBLIB = $(TOP)/lib/kdb/libkdb.a DbmLib
+           KDBLIB = $(DEPKDBLIB) DbmLib
 
 #ifdef UseInstalled
             IMAKE = imake              /* assume BINDIR in path */