Remove SCLIB references from Windows build

The SCLIB make variable was introduced in commit c53f7fd and obsoleted in commit 1f0a33e. Remove the remaining traces of it.
krb5 · May 13, 2018 · a71487d · a71487d
1 parent d03c7fa
commit a71487d
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 18 deletions.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
@@ -32,11 +32,11 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 ##WIN32##$(GSSSERVER): $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) $(SERVERRES)
-##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
+##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 ##WIN32##	$(_VC_MANIFEST_EMBED_EXE)
 
 ##WIN32##$(GSSCLIENT): $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) $(CLIENTRES)
-##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
+##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 ##WIN32##	$(_VC_MANIFEST_EMBED_EXE)
 
 clean-unix::

diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
@@ -96,7 +96,7 @@ $(CCLIBRES): $(VERSIONRC)
 
 $(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def $(CCLIBRES)
 	$(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \
-	    /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) $(CCLIBRES) rpcrt4.lib $(conlibsdll) $(conflags)
+	    /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(CCLIBRES) rpcrt4.lib $(conlibsdll) $(conflags)
 
 $(CCLIB).def:
     echo ;$(CCLIB).def is generated by a Makefile rule. > $(CCLIB).def

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
@@ -22,7 +22,7 @@ klist: klist.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o $@ klist.o $(KRB5_BASE_LIBS)
 
 ##WIN32##$(KLIST): $(OUTPRE)klist.obj $(SLIB) $(KLIB) $(CLIB) $(EXERES)
-##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
+##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
 ##WIN32##	$(_VC_MANIFEST_EMBED_EXE)
 
 clean-unix::

diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
@@ -29,5 +29,5 @@ install-all install-kdc install-server install-client install-unix:
 ##WIN32##all-windows: $(KPWD)
 
 ##WIN32##$(KPWD): $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) $(EXERES)
-##WIN32##	link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB)
+##WIN32##	link $(EXE_LINKOPTS) -out:$@ $**
 ##WIN32##	$(_VC_MANIFEST_EMBED_EXE)
diff --git a/src/config/win-pre.in b/src/config/win-pre.in
@@ -137,7 +137,6 @@ ENTRYPOINT=_DllMainCRTStartup
 ENTRYPOINT=_DllMainCRTStartup@12
 !endif
 CCLINKOPTION=
-SCLIB=
 DEBUGOPT=/Zi
 
 #if the compiler is vstudio 8, generate manifest

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
@@ -100,7 +100,7 @@ clean-windows::
 
 ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \
-##WIN32##	  $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB)
+##WIN32##	  $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS)
 ##WIN32##	$(_VC_MANIFEST_EMBED_DLL)
 ##WIN32##$(SDEF): ..\util\support\libkrb5support.exports
 ##WIN32##	echo EXPORTS > $(SDEF).new
@@ -110,7 +110,7 @@ clean-windows::
 
 ##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CRES) $(SLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(CDEF) -out:$*.dll \
-##WIN32##	  $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) $(SCLIB)
+##WIN32##	  $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS)
 ##WIN32##	$(_VC_MANIFEST_EMBED_DLL)
 
 ##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PRES) $(CLIB) $(SLIB)
@@ -120,12 +120,12 @@ clean-windows::
 
 ##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \
-##WIN32##	  $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) $(SCLIB)
+##WIN32##	  $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS)
 ##WIN32##	$(_VC_MANIFEST_EMBED_DLL)
 
 ##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \
-##WIN32##	  $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) $(SCLIB)
+##WIN32##	  $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS)
 ##WIN32##		$(_VC_MANIFEST_EMBED_DLL)
 
 ##WIN32##$(K5_GLUE): win_glue.c

diff --git a/src/util/windows/Makefile.in b/src/util/windows/Makefile.in
@@ -3,7 +3,7 @@ BUILDTOP = ..\..
 all-windows: $(OUTPRE)libecho.exe
 
 $(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj
-	link -out:$@ $** $(SCLIB)
+	link -out:$@ $**
 	$(_VC_MANIFEST_EMBED_EXE)
 
 install-windows:

diff --git a/src/util/wshelper/Makefile.in b/src/util/wshelper/Makefile.in
@@ -54,7 +54,7 @@ clean-windows::
 
 $(OUTPRE)$(DLL_NAME).dll: $(DEF_FILE) $(OBJS) $(XOBJS)
 	link $(WINDLLFLAGS) -def:$(DEF_FILE) -out:$*.dll \
-	$(OBJS) $(XOBJS) $(WINLIBS) $(SCLIB)
+	$(OBJS) $(XOBJS) $(WINLIBS)
 	$(_VC_MANIFEST_EMBED_DLL)
 
 $(OUTPRE)dllmain.$(OBJEXT): pwd.h

diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
@@ -54,7 +54,7 @@ all: Makefile $(OUTPRE)$(NAME).exe
 
 $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
-	  $(LIBS) $(SYSLIBS) $(SCLIB)
+	  $(LIBS) $(SYSLIBS)
 				$(_VC_MANIFEST_EMBED_EXE)
 
 install:

diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
@@ -35,11 +35,11 @@ $(EXERES): $(VERSIONRC)
 all-windows: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe
 
 $(KFWLOGON): $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(LIBRES)
-    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) ../lib/$(OUTPRE)libwin.lib $(LIBRES)
+    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) ../lib/$(OUTPRE)libwin.lib $(LIBRES)
     $(_VC_MANIFEST_EMBED_DLL)
 
 $(KFWCPCC): $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(EXERES)
-    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) ../lib/$(OUTPRE)libwin.lib $(EXERES)
+    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) ../lib/$(OUTPRE)libwin.lib $(EXERES)
     $(_VC_MANIFEST_EMBED_EXE)
 
 install:

diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
@@ -90,7 +90,7 @@ all: Makefile $(OUTPRE)$(EXE_NAME).exe
 $(OUTPRE)$(EXE_NAME).exe: $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /out:$@ /ENTRY:WinMainCRTStartup $(OBJS) $(XOBJS) \
 	  $(LIBS) $(SYSLIBS) $(BUILDTOP)\util\wshelper\$(OUTPRE)$(WSHELPER).lib \
-	  ../lib/$(OUTPRE)libwin.lib $(SCLIB)
+	  ../lib/$(OUTPRE)libwin.lib
 	copy $@ "$(OUTPRE)MIT Kerberos.exe"
 
 kfwribbon.bml kfwribbon.h kfwribbon.rc: kfwribbon.xml

diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in
@@ -75,7 +75,7 @@ clean-windows::
 
 $(OUTPRE)$(DLL_NAME).dll: $(DEF_FILE) $(OBJS) $(XOBJS)
 	link $(WINDLLFLAGS) -def:$(DEF_FILE) -out:$*.dll \
-	$(OBJS) $(XOBJS) $(WINLIBS) ../lib/$(OUTPRE)libwin.lib $(SCLIB)
+	$(OBJS) $(XOBJS) $(WINLIBS) ../lib/$(OUTPRE)libwin.lib
 	$(_VC_MANIFEST_EMBED_DLL)
 
 #TODO: Add dependencies on include files here

diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
@@ -34,7 +34,7 @@ all: Makefile $(OUTPRE)telnet.exe
 
 $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
-	  $(LIBS) $(SYSLIBS) $(SCLIB)
+	  $(LIBS) $(SYSLIBS)
 	$(_VC_MANIFEST_EMBED_EXE)
 
 install: