diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-11-25 20:28:30 +0000 |
commit | 530043377ee6f39b9ca95c13f6260602e6fe7674 (patch) | |
tree | 28fd4b42c486d7097c4cd537d90042bb5fda3852 /src/lib/crypto/builtin/Makefile.in | |
parent | e9dd6e21afc9af2237e9ae5590ad5a67e52fb24e (diff) | |
download | krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.gz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.tar.xz krb5-530043377ee6f39b9ca95c13f6260602e6fe7674.zip |
Fix Windows build
Repair the Windows build. Tested with the prepare-on-Unix method.
Some specific changes include:
* Removed the IPC finalizer (no longer used after r20787) from
ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
chain for the pingtest build in ccapi/test. Also updated pingtest
to use the k5_ipc_stream interfaces since cci_stream is gone.
* Reverted the apparently non-functional r20277.
* klist -V prints just "Kerberos for Windows", since it has no access
to PACKAGE_NAME and PACKAGE_VERSION from autoconf. This should be
addressed correctly.
* krb5, telnet, gssftp, and NIM are removed from the build.
* Some files had CRLFs; these were replaced with LFs and the
svn:eol-style property set on the files. Otherwise the CRLFs became
CRCRLFs after the zip transfer.
* Windows does not have opendir/readdir, so added Windows code to
prof_parse.c for includedir. Probable fodder for a libkrb5support
portability shim.
ticket: 6826
target_version: 1.9
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24533 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/builtin/Makefile.in')
-rw-r--r-- | src/lib/crypto/builtin/Makefile.in | 74 |
1 files changed, 39 insertions, 35 deletions
diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in index 240d2895b..603c57cd0 100644 --- a/src/lib/crypto/builtin/Makefile.in +++ b/src/lib/crypto/builtin/Makefile.in @@ -20,11 +20,9 @@ DEFS= EXTRADEPSRCS= $(srcdir)/t_cf2.c -##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 $(OUTPRE)camellia.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 $(OUTPRE)camellia.lst +##DOS##BUILDTOP = ..\..\.. +##DOS##PREFIXDIR = builtin +##DOS##OBJFILE = ..\$(OUTPRE)builtin.lst STLIBOBJS=\ hmac.o \ @@ -78,91 +76,97 @@ clean:: all-windows:: - cd ..\des - @echo Making in crypto\des + cd des + @echo Making in crypto\builtin\des $(MAKE) -$(MFLAGS) cd ..\md4 - @echo Making in crypto\md4 + @echo Making in crypto\builtin\md4 $(MAKE) -$(MFLAGS) cd ..\md5 - @echo Making in crypto\md5 + @echo Making in crypto\builtin\md5 $(MAKE) -$(MFLAGS) cd ..\sha1 - @echo Making in crypto\sha1 + @echo Making in crypto\builtin\sha1 $(MAKE) -$(MFLAGS) - cd ..\sh2a - @echo Making in crypto\sha2 + cd ..\sha2 + @echo Making in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) cd ..\hash_provider - @echo Making in crypto\hash_provider + @echo Making in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) cd ..\enc_provider - @echo Making in crypto\enc_provider + @echo Making in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) cd ..\aes - @echo Making in crypto\aes + @echo Making in crypto\builtin\aes $(MAKE) -$(MFLAGS) cd ..\camellia - @echo Making in crypto\camellia + @echo Making in crypto\builtin\camellia $(MAKE) -$(MFLAGS) cd .. + @echo Making in crypto\builtin clean-windows:: - cd ..\des - @echo Making clean in crypto\des + cd des + @echo Making clean in crypto\builtin\des $(MAKE) -$(MFLAGS) clean cd ..\md4 - @echo Making clean in crypto\md4 + @echo Making clean in crypto\builtin\md4 $(MAKE) -$(MFLAGS) clean cd ..\md5 - @echo Making clean in crypto\md5 + @echo Making clean in crypto\builtin\md5 $(MAKE) -$(MFLAGS) clean cd ..\sha1 - @echo Making clean in crypto\sha1 + @echo Making clean in crypto\builtin\sha1 $(MAKE) -$(MFLAGS) clean cd ..\sha2 - @echo Making clean in crypto\sha2 + @echo Making clean in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) clean cd ..\hash_provider - @echo Making clean in crypto\hash_provider + @echo Making clean in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) clean cd ..\enc_provider - @echo Making clean in crypto\enc_provider + @echo Making clean in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) clean cd ..\aes - @echo Making clean in crypto\aes + @echo Making clean in crypto\builtin\aes $(MAKE) -$(MFLAGS) clean cd ..\camellia - @echo Making clean in crypto\camellia + @echo Making clean in crypto\builtin\camellia $(MAKE) -$(MFLAGS) clean cd .. + @echo Making clean in crypto\builtin check-windows:: - cd ..\des - @echo Making check in crypto\des + cd des + @echo Making check in crypto\builtin\des $(MAKE) -$(MFLAGS) check cd ..\md4 - @echo Making check in crypto\md4 + @echo Making check in crypto\builtin\md4 $(MAKE) -$(MFLAGS) check cd ..\md5 - @echo Making check in crypto\md5 + @echo Making check in crypto\builtin\md5 $(MAKE) -$(MFLAGS) check cd ..\sha1 - @echo Making check in crypto\sha1 + @echo Making check in crypto\builtin\sha1 + $(MAKE) -$(MFLAGS) check + cd ..\sha2 + @echo Making check in crypto\builtin\sha2 $(MAKE) -$(MFLAGS) check cd ..\hash_provider - @echo Making check in crypto\hash_provider + @echo Making check in crypto\builtin\hash_provider $(MAKE) -$(MFLAGS) check cd ..\enc_provider - @echo Making check in crypto\enc_provider + @echo Making check in crypto\builtin\enc_provider $(MAKE) -$(MFLAGS) check cd ..\aes - @echo Making check in crypto\aes + @echo Making check in crypto\builtin\aes $(MAKE) -$(MFLAGS) check cd ..\camellia - @echo Making check in crypto\camellia + @echo Making check in crypto\builtin\camellia $(MAKE) -$(MFLAGS) check cd .. + @echo Making check in crypto\builtin @lib_frag@ |