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/windows/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/windows/Makefile.in')
-rw-r--r-- | src/windows/Makefile.in | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in index f1a46c0df2..6447cf4c60 100644 --- a/src/windows/Makefile.in +++ b/src/windows/Makefile.in @@ -4,19 +4,15 @@ NO_OUTPRE=1 # # Makefile that recurses into cns subdirectory. # -all-windows:: ntsecapitest +all-windows:: @echo Making in windows\lib cd lib $(MAKE) -$(MFLAGS) @echo Making in windows\cns cd ..\cns $(MAKE) -$(MFLAGS) - @echo Making in windows\wintel - cd ..\wintel - $(MAKE) -$(MFLAGS) - @echo Making in windows\gss + @echo Making in windows\gss cd ..\gss - cd $(MAKE) -$(MFLAGS) @echo Making in windows\gina cd ..\gina @@ -28,22 +24,16 @@ all-windows:: ntsecapitest @echo Making in windows\kfwlogon cd ..\kfwlogon $(MAKE) -$(MFLAGS) - @echo Making in windows\identity - cd ..\identity - $(MAKE) -$(MFLAGS) !endif cd .. -clean-windows:: clean-ntsecapitest +clean-windows:: @echo Making clean in windows\lib cd lib $(MAKE) -$(MFLAGS) clean @echo Making clean in windows\cns cd ..\cns $(MAKE) -$(MFLAGS) clean - @echo Making clean in windows\wintel - cd ..\wintel - $(MAKE) -$(MFLAGS) clean @echo Making clean in windows\gss cd ..\gss $(MAKE) -$(MFLAGS) clean @@ -57,20 +47,5 @@ clean-windows:: clean-ntsecapitest @echo Making clean in windows\kfwlogon cd ..\kfwlogon $(MAKE) -$(MFLAGS) clean - @echo Making clean in windows\identity - cd ..\identity - $(MAKE) -$(MFLAGS) clean !endif cd .. - -# If ntsecapi.h contains the string that indicates it came from the Vista SDK, -# then ntsecapitest.i will be left behind. If the string is not present, -# ntsecapitest.i will be deleted. -ntsecapitest:: ntsecapitest.i - ntsecapitest.pl - -clean-ntsecapitest:: - $(RM) ntsecapitest.i - -{}.c{}.i: - @$(C_RULE) -P |