diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-10-22 00:01:56 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-10-22 00:01:56 +0000 |
| commit | f6fe2be37c17c7cabb61af0f3e676dcecea8f5a8 (patch) | |
| tree | 471e1f3a54b6e228a4db695dfc0030d53f2aede1 /src/lib/crypto/nss | |
| parent | edfff4b06ffcb9924885e4790792093349cf2585 (diff) | |
| download | krb5-f6fe2be37c17c7cabb61af0f3e676dcecea8f5a8.tar.gz krb5-f6fe2be37c17c7cabb61af0f3e676dcecea8f5a8.tar.xz krb5-f6fe2be37c17c7cabb61af0f3e676dcecea8f5a8.zip | |
Make it possible to override CRYPTO_IMPL_CFLAGS and CRYPTO_IMPL_LIBS at
make time.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24469 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/nss')
| -rw-r--r-- | src/lib/crypto/nss/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/nss/des/Makefile.in | 4 | ||||
| -rw-r--r-- | src/lib/crypto/nss/enc_provider/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/nss/hash_provider/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/nss/md5/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/nss/sha1/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/nss/sha2/Makefile.in | 3 |
7 files changed, 15 insertions, 7 deletions
diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in index c50a74a84..7ce3cc8a9 100644 --- a/src/lib/crypto/nss/Makefile.in +++ b/src/lib/crypto/nss/Makefile.in @@ -1,6 +1,7 @@ mydir=lib/crypto/nss BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS=des aes camellia md4 md5 sha1 sha2 enc_provider hash_provider +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/../krb \ -I$(srcdir)/../krb/hash_provider \ -I$(srcdir)/des \ @@ -11,7 +12,7 @@ LOCALINCLUDES = -I$(srcdir)/../krb \ -I$(srcdir)/md5 \ -I$(srcdir)/enc_provider \ -I$(srcdir)/hash_provider \ - @CRYPTO_IMPL_CFLAGS@ + $(CRYPTO_IMPL_CFLAGS) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in index d97fcfbd8..dc0e5e8ee 100644 --- a/src/lib/crypto/nss/des/Makefile.in +++ b/src/lib/crypto/nss/des/Makefile.in @@ -1,6 +1,8 @@ mydir=lib/crypto/nss/des BUILDTOP=$(REL)..$(S)..$(S)..$(S).. -LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb @CRYPTO_IMPL_CFLAGS@ +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \ + $(CRYPTO_IMPL_CFLAGS) DEFS= diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in index c7950d642..f1ed5fb06 100644 --- a/src/lib/crypto/nss/enc_provider/Makefile.in +++ b/src/lib/crypto/nss/enc_provider/Makefile.in @@ -1,12 +1,13 @@ mydir=lib/crypto/nss/enc_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/../des \ -I$(srcdir)/../arcfour \ -I$(srcdir)/../aes \ -I$(srcdir)/../../krb \ -I$(srcdir)/../../krb/rand2key \ -I$(srcdir)/.. -I$(srcdir)/. \ - @CRYPTO_IMPL_CFLAGS@ + $(CRYPTO_IMPL_CFLAGS) DEFS= ##DOS##BUILDTOP = ..\..\..\.. diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in index 2530559d9..36ba7b2df 100644 --- a/src/lib/crypto/nss/hash_provider/Makefile.in +++ b/src/lib/crypto/nss/hash_provider/Makefile.in @@ -1,8 +1,9 @@ mydir=lib/crypto/nss/hash_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ -I$(srcdir)/.. -I$(srcdir)/../../krb \ - @CRYPTO_IMPL_CFLAGS@ + $(CRYPTO_IMPL_CFLAGS) DEFS= diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in index 94a9e5437..83699a3f1 100644 --- a/src/lib/crypto/nss/md5/Makefile.in +++ b/src/lib/crypto/nss/md5/Makefile.in @@ -8,7 +8,8 @@ DEFS= PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@ +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ +LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS) STLIBOBJS= md5.o diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in index a7cb6e824..7afeb3813 100644 --- a/src/lib/crypto/nss/sha1/Makefile.in +++ b/src/lib/crypto/nss/sha1/Makefile.in @@ -1,7 +1,8 @@ mydir=lib/crypto/nss/sha1 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@ +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ +LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR=sha1 diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in index b42462eb2..c0605e8de 100644 --- a/src/lib/crypto/nss/sha2/Makefile.in +++ b/src/lib/crypto/nss/sha2/Makefile.in @@ -1,7 +1,8 @@ mydir=lib/crypto/nss/sha2 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@ +CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ +LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR=sha1 |