From: John Kohl <jtkohl@mit.edu>
Date: Fri, 15 Feb 1991 09:39:42 +0000 (+0000)
Subject: change around locations & such for libraries
X-Git-Tag: krb5-1.0-alpha4~270
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5c12a586b02d2a156e4152f8f0c32147ad80c30;p=krb5.git

change around locations & such for libraries

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

diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index b7e2eab12..40eed0814 100644
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -158,6 +158,23 @@ newname: stockname Makefile						@@\
 	-$(UNIFDEF) $(PROCESS_DEFINES) stockname >newname
 #endif /* ProcessStockHeader */
 
+/*
+ * Krb5LibraryTarget - generate rules to create a library, and link to it
+ * in the library dir
+ */
+#ifndef Krb5LibraryTarget
+#define	Krb5LibraryTarget(libname,objlist)				@@\
+AllTarget(lib/**/libname.a)						@@\
+DependTarget()								@@\
+									@@\
+lib/**/libname.a: objlist						@@\
+	$(RM) $@							@@\
+	$(AR) $@ objlist						@@\
+	$(RANLIB) $@							@@\
+	$(RM) $(TOPLIBD)/lib/**/libname.a				@@\
+	$(LN) ../$(CURRENT_DIR)/lib/**/libname.a $(TOP)/lib/lib/**/libname.a
+#endif /* Krb5LibraryTarget */
+
 #if HasPosixTermios
 P_TERMIOS=-DHasPosixTermiosTrue
 #else
@@ -251,20 +268,23 @@ P_PROTOS=-UUseNarrowPrototypes
             ETSRC = $(TOP)/comerr
             SSSRC = $(TOP)/ss
        UNIFDEFSRC = $(TOP)/util/unifdef
-            OSLIB = $(TOP)/lib/os/libos.a
-           DESLIB = $(TOP)/lib/des/libdes.a
-        RSAMD4LIB = $(TOP)/lib/rsa-md4/libmd4.a
-          KRB5LIB = $(TOP)/lib/libkrb5.a
-           CRCLIB = $(TOP)/lib/crc-32/libcrc32.a
-           MD4LIB = $(TOP)/lib/rsa-md4/libmd4.a
+          TOPLIBD = $(TOP)/lib
+            OSLIB = os
+           DESLIB = des
+        RSAMD4LIB = md4
+          KRB5LIB = krb5
+           CRCLIB = crc32
+           MD4LIB = md4
          ISODELIB = IsodeLib
 
            DBMLIB = DbmLib
-          DEPKLIB = $(KRB5LIB) $(RSAMD4LIB) $(DESLIB) $(OSLIB) $(CRCLIB)
-             KLIB = $(DEPKLIB) $(ISODELIB) $(COMERRLIB) $(DBMLIB)
-        DEPKDBLIB = $(TOP)/lib/kdb/libkdb.a
+          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 = $(TOP)/lib/krb425/libkrb425.a
+     DEPKRB425LIB = $(TOPLIBD)/libkrb425.a
         KRB425LIB = $(DEPKDBLIB)
           KRB4LIB = Krb4LibList
      KRB4INCLUDES = Krb4Includes
diff --git a/src/config/site.def b/src/config/site.def
index 177be8ee7..1789da841 100644
--- a/src/config/site.def
+++ b/src/config/site.def
@@ -78,7 +78,7 @@
    library.  This might want to be -lisode if you have it installed.
    IsodeDir is put into the 'make' variable ISODE. */
 
-#define IsodeLib /mit/isode/isode-6.0/@sys/lib/libisode.a
+#define IsodeLib -L/mit/isode/isode-6.0/@sys/lib -lisode
 #define IsodeDir /mit/isode/isode-6.0
 
 /* Re-define PepyCmd and PosyCmd if pepy & posy aren't in your search