diff options
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/ccapi/common/win/OldCC/name.h | 3 | ||||
| -rw-r--r-- | src/ccapi/lib/win/Makefile.in | 26 | ||||
| -rw-r--r-- | src/ccapi/test/Makefile.in | 4 | ||||
| -rw-r--r-- | src/config/win-pre.in | 4 | ||||
| -rw-r--r-- | src/windows/leashdll/Makefile.in | 2 |
6 files changed, 19 insertions, 22 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 660aebee54..e4d1e6f701 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -552,7 +552,7 @@ install-windows:: copy appl\gss-sample\$(OUTPRE)gss-server.exe "$(KRB_INSTALL_DIR)\bin\." copy appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\." copy windows\ms2mit\$(OUTPRE)ms2mit.exe "$(KRB_INSTALL_DIR)\bin\." - copy ccapi\lib\win\srctmp\$(OUTPRE)ccapi.dll "$(KRB_INSTALL_DIR)\bin\." + copy ccapi\lib\win\srctmp\$(OUTPRE)$(CCLIB).dll "$(KRB_INSTALL_DIR)\bin\." copy ccapi\server\win\srctmp\$(OUTPRE)ccapiserver.exe "$(KRB_INSTALL_DIR)\bin\." copy clients\kvno\$(OUTPRE)kvno.exe "$(KRB_INSTALL_DIR)\bin\." copy clients\klist\$(OUTPRE)klist.exe "$(KRB_INSTALL_DIR)\bin\." diff --git a/src/ccapi/common/win/OldCC/name.h b/src/ccapi/common/win/OldCC/name.h index 42a3fba2b4..66ca3a9f86 100644 --- a/src/ccapi/common/win/OldCC/name.h +++ b/src/ccapi/common/win/OldCC/name.h @@ -31,7 +31,4 @@ #define CCAPI_MODULE "krbcc32" #endif #define CCAPI_DLL CCAPI_MODULE ".dll" -#define CCAPI_EXE CCAPI_MODULE "s.exe" - -#define CCAPI_DLL "ccapi.dll" #define CCAPI_EXE "ccapiserver.exe"
\ No newline at end of file diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index f97c92b0cb..62229ba78f 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -65,7 +65,7 @@ LINK = link LIBS = ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib LFLAGS = /nologo $(LOPTS) -all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish +all:: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ @@ -76,7 +76,7 @@ ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf ccs_reply.idl copysrc : - echo "Copying all sources needed to build ccapi.dll to $(SRCTMP)" + echo "Copying all sources needed to build $(CCLIB).dll to $(SRCTMP)" if NOT exist $(SRCTMP)\nul mkdir $(SRCTMP) xcopy /D/Y $(CO)\*.* $(SRCTMP) xcopy /D/Y $(COWIN)\*.* $(SRCTMP) @@ -90,17 +90,17 @@ copysrc : midl : ccs_request.h ccs_reply.h # Main program: -$(OUTPRE)ccapi.dll: $(OBJS) ccapi.def - $(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \ - /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags) - -ccapi.def: - echo ;ccapi.def is generated by a Makefile rule. > ccapi.def - echo HEAPSIZE 8192 >> ccapi.def - echo EXPORTS >> ccapi.def - type ccapi.exports >> ccapi.def - type ccapi_v2.exports >> ccapi.def - type debug.exports >> ccapi.def +$(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def + $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \ + /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags) + +$(CCLIB).def: + echo ;$(CCLIB).def is generated by a Makefile rule. > $(CCLIB).def + echo HEAPSIZE 8192 >> $(CCLIB).def + echo EXPORTS >> $(CCLIB).def + type ccapi.exports >> $(CCLIB).def + type ccapi_v2.exports >> $(CCLIB).def + type debug.exports >> $(CCLIB).def finish: echo "Finished in ccapi/lib/win." diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in index bf950b6a7f..972e464ec0 100644 --- a/src/ccapi/test/Makefile.in +++ b/src/ccapi/test/Makefile.in @@ -135,7 +135,7 @@ MORE_TESTS = test_cc_context_release \ ##### Linker LINK = link LIBS = -lkrb5 -##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib ccapi.lib +##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib $(CCLIB).lib LFLAGS = /nologo $(LOPTS) all-mac:: setup-test-dir pingtest simple_lock_test build-base build-tests link-tests copy-script success-message @@ -188,7 +188,7 @@ $(COWSRC): $(OUTPRE)pingtest.exe: $(OBJECTS) $(PINGOBJS) # There doesn't appear to be any way to examine a variable and return a value # indicating whether a string is present in it. We use a perl script to -# check the LIB variable. If the path to ccapi.lib isn't present, the script +# check the LIB variable. If the path to $(CCLIB).lib isn't present, the script # deletes a.tmp and the following nmake actions correct LIB. echo %%PATH%% > a.tmp perl setlib.pl diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 40db299d83..965942b06d 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -198,7 +198,7 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib -CCLIB=$(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib +CCLIB=krbcc32 WLIB= !if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) @@ -208,7 +208,7 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib -CCLIB=$(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib +CCLIB=krbcc64 WLIB= !endif diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in index 8846b5ec6a..418a0a0f87 100644 --- a/src/windows/leashdll/Makefile.in +++ b/src/windows/leashdll/Makefile.in @@ -50,7 +50,7 @@ RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DLEASHDLL_LIB LOCALINCLUDES = -I$(BUILDTOP)\include -I.\include -I.\include\krb4 $(AFS_INCLUDES) WINLIBS = kernel32.lib advapi32.lib user32.lib gdi32.lib Version.lib \ - ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib $(AFS_LIBS) + ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\$(CCLIB).lib $(AFS_LIBS) WINDLLFLAGS = /nologo /dll /incremental:no /release $(LOPTS) |