diff options
author | Kevin Koch <kpkoch@mit.edu> | 2008-02-19 15:22:13 +0000 |
---|---|---|
committer | Kevin Koch <kpkoch@mit.edu> | 2008-02-19 15:22:13 +0000 |
commit | 1ad7c24419422ce0d62c80699eb4cd30b1c3d51b (patch) | |
tree | a8d853bff3d5101093ed37a2a9cf8f3fbc8628fb /src/Makefile.in | |
parent | c90fb4c40ec4fb78e4d1b2a40c9c5af36225603c (diff) | |
download | krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.tar.gz krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.tar.xz krb5-1ad7c24419422ce0d62c80699eb4cd30b1c3d51b.zip |
Changes to integrate the CCAPI build into the build structure, build the test suite and fixes to random problems discovered along the way
Since no platform other than windows builds CCAPI using the build system, some conditionalizing may be necessary when other platforms use the makefiles.
src/Makefile.in: Add CPPFLAGS that seemed to be missing; run wconfig for ccapi/(lib, server, test).
config/win-pre.in: DEBUGOPT /ZI doesn't seem to provide enough debugging information under VS2005; /Zi does.
windows/build/bkw.pl: Fix -no<switch> so that -nonodebug will work. Otherwise, can't do debug build.
Move Get/PutTspData out of dllmain; add tlsindex argument.
Comment out some debug messages.
TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20229 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/Makefile.in')
-rw-r--r-- | src/Makefile.in | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 055fb5d8b7..3fbc950263 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,6 +15,9 @@ LOCALINCLUDES = -I$(srcdir) SRCS = HDRS = +# Why aren't these flags showing up in Windows builds? +##DOS##CPPFLAGS=$(CPPFLAGS) -D_X86_=1 -DWIN32 -D_WIN32 -W3 -D_WINNT + DISTFILES = $(SRCS) $(HDRS) COPYING COPYING.LIB ChangeLog Makefile.in all-unix:: krb5-config @@ -36,6 +39,12 @@ all-windows:: maybe-awk Makefile-windows @echo Making autoconf.h in include cd include $(MAKE) -$(MFLAGS) autoconf.h + + @echo Making in ccapi + cd ..\ccapi + cd + $(MAKE) -$(MFLAGS) + @echo Making in util cd ..\util $(MAKE) -$(MFLAGS) @@ -171,6 +180,10 @@ config-windows:: Makefile-windows WINMAKEFILES=Makefile \ appl\gss-sample\Makefile \ appl\gssftp\ftp\Makefile \ + ccapi\Makefile \ + ccapi\lib\win\Makefile \ + ccapi\server\win\Makefile \ + ccapi\test\Makefile \ clients\Makefile clients\kdestroy\Makefile \ clients\kinit\Makefile clients\klist\Makefile \ clients\kpasswd\Makefile clients\kvno\Makefile \ @@ -215,6 +228,14 @@ WINMAKEFILES=Makefile \ ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##appl\gssftp\ftp\Makefile: appl\gssftp\ftp\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##ccapi\Makefile: ccapi\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##ccapi\lib\win\Makefile: ccapi\lib\win\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##ccapi\server\win\Makefile: ccapi\server\win\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##ccapi\test\Makefile: ccapi\test\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\Makefile: clients\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##clients\kdestroy\Makefile: clients\kdestroy\Makefile.in $(MKFDEP) @@ -344,10 +365,10 @@ clean-windows:: Makefile-windows @echo Making clean in clients cd ..\clients $(MAKE) -$(MFLAGS) clean - @echo Making in appl\gss-sample + @echo Making clean in appl\gss-sample cd ..\appl\gss-sample $(MAKE) -$(MFLAGS) clean - @echo Making in appl\gssftp\ftp + @echo Making clean in appl\gssftp\ftp cd ..\..\appl\gssftp\ftp $(MAKE) -$(MFLAGS) clean cd ..\..\.. @@ -365,7 +386,7 @@ ren2long: # ZIP=zip FILES= ./* \ - clients/* clients/kdestroy/* clients/kinit/* clients/klist/* \ + clients/* clients/kdestroy/* clients/kinit/* clients/klist/* \ clients/kpasswd/* clients/kcpytkt/* clients/kdeltkt/* \ config/* include/* include/kerberosIV/* \ include/krb5/* include/krb5/stock/* include/sys/* krb524/* lib/* \ @@ -383,7 +404,12 @@ FILES= ./* \ lib/krb5/os/* lib/krb5/posix/* lib/krb5/rcache/* \ util/* util/et/* util/profile/* -WINFILES= util/windows/* windows/* windows/lib/* windows/cns/* \ +WINFILES= \ + ccapi/common/* ccapi/common/win/* ccapi/common/win/OldCC/* \ + ccapi/lib/* ccapi/lib/win/* ccapi/lib/win/OldCC/* \ + ccapi/server/* ccapi/server/win/* \ + ccapi\test\* \ + util/windows/* windows/* windows/lib/* windows/cns/* \ windows/wintel/* windows/gss/* windows/gina/* windows/ms2mit/* \ windows/kfwlogon/* @@ -575,6 +601,8 @@ install-windows:: $(CP) appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\." $(CP) windows\ms2mit\$(OUTPRE)ms2mit.exe "$(KRB_INSTALL_DIR)\bin\." $(CP) appl\gssftp\ftp\$(OUTPRE)ftp.exe "$(KRB_INSTALL_DIR)\bin\." + $(CP) ccapi\lib\win\$(OUTPRE)ccapi.dll "$(KRB_INSTALL_DIR)\bin\." + $(CP) ccapi\server\win\$(OUTPRE)ccapiserver.exe "$(KRB_INSTALL_DIR)\bin\." $(CP) clients\kvno\$(OUTPRE)kvno.exe "$(KRB_INSTALL_DIR)\bin\." $(CP) clients\klist\$(OUTPRE)klist.exe "$(KRB_INSTALL_DIR)\bin\." $(CP) clients\kinit\$(OUTPRE)kinit.exe "$(KRB_INSTALL_DIR)\bin\." |