pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / lib / crypto / nss / Makefile.in

diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index c50a74a84d75e2d6eaf4d592aef07ea5193127b4..7016e924b271833bc3fb741cde2d80623e0ccca5 100644 (file)
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -1,6 +1,7 @@
-mydir=lib/crypto/nss
+mydir=lib$(S)crypto$(S)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,18 +12,12 @@ 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)
 DEFS=
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
-
 STLIBOBJS=\
        hmac.o  \
        pbkdf2.o                
@@ -50,8 +45,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST       \
                aes/OBJS.ST                     \
                camellia/OBJS.ST
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -59,97 +52,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-       cd ..\des
-       @echo Making in crypto\des
-       $(MAKE) -$(MFLAGS)
-       cd ..\md4
-       @echo Making in crypto\md4
-       $(MAKE) -$(MFLAGS)
-       cd ..\md5
-       @echo Making in crypto\md5
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha1
-       @echo Making in crypto\sha1
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha2
-       @echo Making in crypto\sh2a
-       $(MAKE) -$(MFLAGS)
-       cd ..\hash_provider
-       @echo Making in crypto\hash_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\enc_provider
-       @echo Making in crypto\enc_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\aes
-       @echo Making in crypto\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..\camellia
-       @echo Making in crypto\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd ..\des
-       @echo Making clean in crypto\des
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md4
-       @echo Making clean in crypto\md4
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md5
-       @echo Making clean in crypto\md5
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha2
-       @echo Making clean in crypto\sha2
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha1
-       @echo Making clean in crypto\sha1
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\hash_provider
-       @echo Making clean in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\enc_provider
-       @echo Making clean in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\aes
-       @echo Making clean in crypto\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\camellia
-       @echo Making clean in crypto\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-
-check-windows::
-       cd ..\des
-       @echo Making check in crypto\des
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md4
-       @echo Making check in crypto\md4
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md5
-       @echo Making check in crypto\md5
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha1
-       @echo Making check in crypto\sha1
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha2
-       @echo Making check in crypto\sha2
-       $(MAKE) -$(MFLAGS) check
-       cd ..\hash_provider
-       @echo Making check in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\enc_provider
-       @echo Making check in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\aes
-       @echo Making check in crypto\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..\camellia
-       @echo Making check in crypto\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-
-
 @lib_frag@
 @libobj_frag@