diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1998-03-03 13:43:29 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1998-03-03 13:43:29 +0000 |
| commit | abde830f77486589e2c796b0cfe8b85300d0b4ba (patch) | |
| tree | 2e15afcbc276b2026c00b46c4eee6f938e50c717 | |
| parent | 068ee28ca1f44ee70665ad501fe3e089f640fa47 (diff) | |
| download | krb5-abde830f77486589e2c796b0cfe8b85300d0b4ba.tar.gz krb5-abde830f77486589e2c796b0cfe8b85300d0b4ba.tar.xz krb5-abde830f77486589e2c796b0cfe8b85300d0b4ba.zip | |
* Makefile.in (t_cksum): Do not depend on libkrb5.a, use
KRB5_BASE_DEPLIBS.
This allows configuration --enable-shared --disable-static to work.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10493 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/md4/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/md4/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/crypto/md5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/md5/Makefile.in | 7 |
4 files changed, 20 insertions, 4 deletions
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index e492c4617..3ca8c0872 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 3 08:39:47 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * Makefile.in (t_cksum): Do not depend on libkrb5.a, use + KRB5_BASE_DEPLIBS. + Wed Feb 18 16:06:57 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index 6d44ed25d..739b34b84 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -8,6 +8,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)" ##DOS##OBJFILE=..\md4.lst ##WIN16##LIBNAME=..\crypto.lib +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + RUN_SETUP=@KRB5_RUN_ENV@ STLIBOBJS=md4.o md4glue.o md4crypto.o @@ -38,8 +41,8 @@ t_cksum.c: $(srcdir)/../md5/t_cksum.c t_cksum.o: t_cksum.c $(CC) -DMD=4 $(CFLAGS) -c t_cksum.c -t_cksum: t_cksum.o $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a - $(CC) $(CFLAGS) -o t_cksum t_cksum.o $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(LIBS) +t_cksum: t_cksum.o $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o t_cksum t_cksum.o $(KRB5_BASE_LIBS) check-unix:: t_mddriver t_cksum $(RUN_SETUP) $(C)t_mddriver -x diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 3e8e78b7c..1c0026add 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 3 08:42:10 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * Makefile.in (t_cksum): Do not depend on libkrb5.a, use + KRB5_BASE_DEPLIBS. + Wed Feb 18 16:07:46 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 560778ed5..3707f897b 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -7,6 +7,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##OBJFILE=..\md5.lst ##WIN16##LIBNAME=..\crypto.lib +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + RUN_SETUP = @KRB5_RUN_ENV@ STLIBOBJS=md5.o md5glue.o md5crypto.o @@ -24,8 +27,8 @@ t_mddriver: t_mddriver.o md5.o t_mddriver.exe: $(CC) $(CFLAGS2) -o t_mddriver.exe t_mddriver.c md5.c -t_cksum: t_cksum.o $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a - $(CC) $(CFLAGS) -o t_cksum t_cksum.o $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(LIBS) +t_cksum: t_cksum.o $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o t_cksum t_cksum.o $(KRB5_BASE_LIBS) check-unix:: t_mddriver t_cksum $(RUN_SETUP) $(C)t_mddriver -x |