diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-10-23 19:45:48 +0000 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2009-10-23 19:45:48 +0000 |
| commit | a2fe16f629710862b4a59685ede4af28410ca151 (patch) | |
| tree | 7deb9f27d511b48512bce170c27e4a3372bafc60 /src/lib/crypto/builtin/sha1 | |
| parent | e1cbf08accafc58d142d18e7f96f21081ab9f291 (diff) | |
| download | krb5-a2fe16f629710862b4a59685ede4af28410ca151.zip krb5-a2fe16f629710862b4a59685ede4af28410ca151.tar.gz krb5-a2fe16f629710862b4a59685ede4af28410ca151.tar.bz2 | |
Changed the crypto make system to add build flexibility. The update cancels the requirement for the dir structures to be identical in all crypto implementation and supports impl. dependent tests. Also, minor libk5crypto.exports list reduction ( from f_tables)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22995 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/builtin/sha1')
| -rw-r--r-- | src/lib/crypto/builtin/sha1/Makefile.in | 25 | ||||
| -rw-r--r-- | src/lib/crypto/builtin/sha1/deps | 4 |
2 files changed, 21 insertions, 8 deletions
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in index 7610881..c93cb85 100644 --- a/src/lib/crypto/builtin/sha1/Makefile.in +++ b/src/lib/crypto/builtin/sha1/Makefile.in @@ -11,11 +11,11 @@ DEFS= PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -STLIBOBJS= ../../@CRYPTO_IMPL@/sha1/shs.o +STLIBOBJS= shs.o -OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/sha1/shs.$(OBJEXT) +OBJS= $(OUTPRE)shs.$(OBJEXT) -SRCS= $(srcdir)/../../@CRYPTO_IMPL@/sha1/shs.c +SRCS= $(srcdir)/shs.c ##DOS##LIBOBJS = $(OBJS) @@ -24,12 +24,25 @@ all-unix:: all-libobjs includes:: depend depend:: $(SRCS) +t_shs: t_shs.o shs.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_shs t_shs.o shs.o $(SUPPORT_LIB) -check-unix:: +$(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj + link -out:$@ $** -check-windows:: +t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB) + $(CC_LINK) -o t_shs3 t_shs3.o shs.o $(SUPPORT_LIB) -clean:: +check-unix:: t_shs t_shs3 + $(RUN_SETUP) $(VALGRIND) $(C)t_shs -x + $(RUN_SETUP) $(VALGRIND) $(C)t_shs3 + +check-windows:: $(OUTPRE)t_shs.exe $(OUTPRE)t_shs3.exe + $(OUTPRE)$(C)t_shs.exe -x + $(OUTPRE)$(C)t_shs3.exe + +clean:: + $(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT) t_shs3$(EXEEXT) t_shs3.$(OBJEXT) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/builtin/sha1/deps b/src/lib/crypto/builtin/sha1/deps index ee1dc4d..a5e424d 100644 --- a/src/lib/crypto/builtin/sha1/deps +++ b/src/lib/crypto/builtin/sha1/deps @@ -10,5 +10,5 @@ shs.so shs.po $(OUTPRE)shs.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.c \ - $(srcdir)/../../builtin/sha1/shs.h + $(SRCTOP)/include/socket-utils.h $(srcdir)/shs.c \ + $(srcdir)/shs.h |