svn rev #24469: trunk/src/lib/crypto/ krb/prng/nss/ nss/ nss/des/ nss/enc_provider/ ...

ghudson@MIT.EDU ghudson at MIT.EDU
Thu Oct 21 20:01:56 EDT 2010 

http://src.mit.edu/fisheye/changelog/krb5/?cs=24469
Commit By: ghudson
Log Message:
Make it possible to override CRYPTO_IMPL_CFLAGS and CRYPTO_IMPL_LIBS at
make time.



Changed Files:
U   trunk/src/lib/crypto/Makefile.in
U   trunk/src/lib/crypto/krb/prng/nss/Makefile.in
U   trunk/src/lib/crypto/nss/Makefile.in
U   trunk/src/lib/crypto/nss/des/Makefile.in
U   trunk/src/lib/crypto/nss/enc_provider/Makefile.in
U   trunk/src/lib/crypto/nss/hash_provider/Makefile.in
U   trunk/src/lib/crypto/nss/md5/Makefile.in
U   trunk/src/lib/crypto/nss/sha1/Makefile.in
U   trunk/src/lib/crypto/nss/sha2/Makefile.in
Modified: trunk/src/lib/crypto/Makefile.in
===================================================================
--- trunk/src/lib/crypto/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -49,8 +49,10 @@
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.
 DEPLIBS=
+CRYPTO_LIBS=@CRYPTO_LIBS@
+CRYPTO_IMPL_LIBS=@CRYPTO_IMPL_LIBS@
 SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_EXPLIBS= $(SUPPORT_LIB) @CRYPTO_LIBS@ @CRYPTO_IMPL_LIBS@ $(LIBS)
+SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_LIBS) $(CRYPTO_IMPL_LIBS) $(LIBS)
 SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@

Modified: trunk/src/lib/crypto/krb/prng/nss/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/nss/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/krb/prng/nss/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -1,7 +1,8 @@
 mydir=lib/crypto/krb/prng/nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-		-I$(srcdir)/../../../@CRYPTO_IMPL@ @CRYPTO_IMPL_CFLAGS@
+		-I$(srcdir)/../../../@CRYPTO_IMPL@ $(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)

Modified: trunk/src/lib/crypto/nss/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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 @@
 		-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)

Modified: trunk/src/lib/crypto/nss/des/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/des/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/des/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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=
 

Modified: trunk/src/lib/crypto/nss/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/enc_provider/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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 = ..\..\..\..

Modified: trunk/src/lib/crypto/nss/hash_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/hash_provider/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/hash_provider/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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=
 

Modified: trunk/src/lib/crypto/nss/md5/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/md5/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/md5/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -8,7 +8,8 @@
 
 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

Modified: trunk/src/lib/crypto/nss/sha1/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/sha1/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/sha1/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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

Modified: trunk/src/lib/crypto/nss/sha2/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/sha2/Makefile.in	2010-10-19 19:57:56 UTC (rev 24468)
+++ trunk/src/lib/crypto/nss/sha2/Makefile.in	2010-10-22 00:01:56 UTC (rev 24469)
@@ -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

More information about the cvs-krb5 mailing list