diff options
| author | John Carr <jfc@mit.edu> | 1991-05-27 22:01:26 +0000 |
|---|---|---|
| committer | John Carr <jfc@mit.edu> | 1991-05-27 22:01:26 +0000 |
| commit | 075cac162c601cd7f70874a7528a60bd4f3c513b (patch) | |
| tree | ef92624d9229d903ea95b87544affe287a55ca94 /src | |
| parent | 95e20b50436eb7a144b06a07dd06efabf3e566b6 (diff) | |
| download | krb5-075cac162c601cd7f70874a7528a60bd4f3c513b.tar.gz krb5-075cac162c601cd7f70874a7528a60bd4f3c513b.tar.xz krb5-075cac162c601cd7f70874a7528a60bd4f3c513b.zip | |
Combine -ldes5, -lmd4, -lcrc-32.
Fix library rules to run ranlib more often.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2112 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/Project.tmpl | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl index 9fb1ecbf5..0193ffd75 100644 --- a/src/config/Project.tmpl +++ b/src/config/Project.tmpl @@ -115,14 +115,21 @@ DependTarget() @@\ foo/**/libname: objlist @@\ $(ARADD) lib/**/libname.a objlist @@\ $(TOUCH) foo/**/libname @@\ - $(RANLIB) lib/**/libname.a @@\ -lib/**/libname.a: objlist @@\ - $(ARADD) $@ objlist @@\ +lib/**/libname.a: foo/**/libname @@\ $(RANLIB) $@ @@\ clean:: @@\ - $(RM_CMD) foo/**/libname + $(RM_CMD) foo/**/libname lib/**/libname.a #endif /* AdditiveLibraryTarget */ +#ifndef RanlibLibraryTarget +#define RanlibLibraryTarget(libname) @@\ +AllTarget(lib/**/libname.a) @@\ +lib/**/libname.a:: foo/**/libname @@\ + $(RANLIB) lib/**/libname.a @@\ +clean:: @@\ + $(RM_CMD) foo/**/libname lib/**/libname.a +#endif + /* * OtherdirLibraryTarget - generate rules to create a library in another * directory from object files here @@ -131,15 +138,15 @@ clean:: @@\ #define OtherdirLibraryTarget(libdir,libname,objlist) @@\ AllTarget(objlist) @@\ AllTarget(libdir/lib/**/libname.a) @@\ -AllTarget(foo/**/libname) @@\ +AllTarget(libdir/foo/**/libname) @@\ DependTarget() @@\ @@\ -foo/**/libname: objlist @@\ +libdir/foo/**/libname: objlist @@\ $(ARADD) libdir/lib/**/libname.a objlist @@\ - $(TOUCH) foo/**/libname @@\ + $(TOUCH) libdir/foo/**/libname @@\ libdir/lib/**/libname.a: @@\ $(ARADD) $@ objlist @@\ - $(TOUCH) foo/**/libname + $(TOUCH) libdir/foo/**/libname /* The $(RANLIB) is done at the end by the directory itself */ #endif /* OtherdirLibraryTarget */ @@ -344,13 +351,18 @@ P_INET=-DHasInetTrue #else P_INET=-UHasInetTrue #endif +/* If HasStdlibH > 1, include <stdlib.h> even if __STDC__ is not defined. */ +#if HasStdlibH > 1 +P_STDLIBH=-DHasStdlibHTrue -DForceStdlibH +#else #if HasStdlibH -P_STDLIBH=-DHasStdlibHTrue +P_STDLIBH=-DHasStdlibHTrue -UForceStdlibH #else -P_STDLIBH=-UHasStdlibHTrue +P_STDLIBH=-UHasStdlibHTrue -UForceStdlibH +#endif #endif -/* Override system defaults for <time.h> vs <sys/time.h> */ #if !defined(UseTimeH) && !defined(UseSysTimeH) +/* Override system defaults for <time.h> vs <sys/time.h> */ #ifdef OS_BSD #define UseSysTimeH #else @@ -414,9 +426,9 @@ P_NPROTO=-UUseNarrowPrototypes ISODELIB = IsodeLib DBMLIB = DbmLib - DEPKLIB = $(KRB5DEPLIB) $(RSAMD4DEPLIB) $(DESDEPLIB) $(OSDEPLIB) $(CRCDEPLIB) + DEPKLIB = $(KRB5DEPLIB) $(DESDEPLIB) $(OSDEPLIB) KLIBLOC = -L$(TOPLIBD) - KLIB = $(KLIBLOC) -l$(KRB5LIB) -l$(RSAMD4LIB) -l$(DESLIB) -l$(OSLIB) -l$(CRCLIB) $(ISODELIB) $(COMERRLIB) $(DBMLIB) + KLIB = $(KLIBLOC) -l$(KRB5LIB) -l$(DESLIB) -l$(OSLIB) $(ISODELIB) $(COMERRLIB) $(DBMLIB) KDBDEPLIB = $(TOPLIBD)/libkdb.a KDBLIB = $(KLIBLOC) -lkdb KRB425DEPLIB = $(TOPLIBD)/libkrb425.a |