NTMakefile-dependencies-20040306

Update dependencies on various libraries to enforce consistency checks

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index a9d54eb..5bbfd42 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -165,12 +165,11 @@ MIDL_FLAGS=/app_config \
 CONF_DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\libafsconf.dll
 
 CONF_DLLLIBS = \
-    dnsapi.lib \
     $(DESTDIR)\lib\afs\afsutil.lib \
     $(DESTDIR)\lib\afs\afsreg.lib
 
-$(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res
-       $(DLLGUILINK) -def:libafsconf.def $(CONF_DLLLIBS)
+$(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
+       $(DLLGUILINK) -def:libafsconf.def dnsapi.lib
        $(DLLPREP)
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
@@ -185,12 +184,11 @@ LOGON_DLLOBJS =\
        $(OUT)\afslogon.res
 
 LOGON_DLLLIBS =\
-    dnsapi.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib
 
-$(LOGON_DLLFILE): $(LOGON_DLLOBJS)
-       $(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def $(LOGON_DLLLIBS)
+$(LOGON_DLLFILE): $(LOGON_DLLOBJS) $(LOGON_DLLLIBS)
+       $(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def dnsapi.lib
        $(DLLPREP)
        $(COPY) $*.lib $(DESTDIR)\lib
        $(DEL) $*.lib $*.exp
@@ -205,12 +203,11 @@ LOG95_DLLOBJS =\
        $(OUT)\afslog95.res
 
 LOG95_DLLLIBS =\
-    dnsapi.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib
 
-$(LOG95_DLLFILE): $(LOG95_DLLOBJS)
-       $(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslog95.def $(LOG95_DLLLIBS)
+$(LOG95_DLLFILE): $(LOG95_DLLOBJS) $(LOG95_DLLLIBS)
+       $(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslog95.def dnsapi.lib
        $(DLLPREP)
        $(COPY) $*.lib $(DESTDIR)\lib
        $(DEL) $*.lib $*.exp
@@ -270,7 +267,6 @@ install_libutils: install_headers $(CONF_DLLFILE) \
 # assorted exe's
 
 EXELIBS = \
-    dnsapi.lib \
        $(DESTDIR)\lib\afs\afsauth.lib \
        $(DESTDIR)\lib\afs\afskauth.lib \
        $(DESTDIR)\lib\afs\afsprot.lib \
@@ -289,28 +285,33 @@ EXELIBS = \
        $(DESTDIR)\lib\libafsconf.lib
 
 # klog.exe
-$(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res
-       $(EXECONLINK) $(EXELIBS)
+$(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS)
+       $(EXECONLINK) dnsapi.lib
        $(EXEPREP)
 
 # tokens.exe
-$(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res
-       $(EXECONLINK) $(EXELIBS)
+$(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS)
+       $(EXECONLINK) dnsapi.lib
        $(EXEPREP)
 
 # unlog.exe
-$(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res
-       $(EXECONLINK) $(EXELIBS)
+$(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS)
+       $(EXECONLINK) dnsapi.lib
        $(EXEPREP)
 
 # afsd.exe
 AFSD_EXEFILE = $(EXEDIR)\afsd.exe
 
-AFSD_EXELIBS =\
+AFSD_SDKLIBS =\
        largeint.lib \
        netapi32.lib \
     mpr.lib \
     dnsapi.lib \
+       rpcrt4.lib \
+       user32.lib \
+    Dbghelp.lib
+
+AFSD_EXELIBS =\
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\afsrpc.lib \
     $(DESTDIR)\lib\afsrx.lib \
@@ -319,28 +320,25 @@ AFSD_EXELIBS =\
        $(DESTDIR)\lib\afs\mtafsint.lib \
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
-    $(LANAHELPERLIB) \
-       rpcrt4.lib \
-       user32.lib \
-    Dbghelp.lib
+    $(LANAHELPERLIB)
 
-$(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS)
-       $(EXEGUILINK) $(AFSD_EXELIBS)
+$(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS) $(AFSD_EXELIBS)
+       $(EXEGUILINK) $(AFSD_SDKLIBS)
        $(EXEPREP)
 
 # afsd_service.exe
-$(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res  $(RXOBJS)
-       $(EXECONLINK) $(AFSD_EXELIBS) /NODEFAULTLIB:libc.lib /MAP
+$(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res  $(RXOBJS) $(AFSD_EXELIBS)
+       $(EXECONLINK) $(AFSD_SDKLIBS) /NODEFAULTLIB:libc.lib /MAP 
        $(EXEPREP)
 
 # fs.exe
-$(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res
-       $(EXECONLINK) $(EXELIBS)
+$(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS)
+       $(EXECONLINK) dnsapi.lib
        $(EXEPREP)
 
 # symlink.exe
-$(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res
-       $(EXECONLINK) $(EXELIBS)
+$(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res  $(EXELIBS)
+       $(EXECONLINK) dnsapi.lib
        $(EXEPREP)
 
 # afsshare.exe

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 90bd9fb..217b871 100644 (file)
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -1216,7 +1216,7 @@ int smb_FindShare(smb_vc_t *vcp, smb_packet_t *inp, char *shareName,
         /* We can accept either unix or PC style AFS pathnames.  Convert
            Unix-style to PC style here for internal use. */
         p = pathName;
-        if (strncmp(p, cm_mountRoot, strlen(cm_mountRoot) == 0)
+        if (strncmp(p, cm_mountRoot, strlen(cm_mountRoot)) == 0)
           p += strlen(cm_mountRoot);  /* skip mount path */
         q = p;
         while (*q) {

diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile
index 066560f..61a7367 100644 (file)
--- a/src/WINNT/client_exp/NTMakefile
+++ b/src/WINNT/client_exp/NTMakefile
@@ -51,16 +51,18 @@ AFSD = ..\afsd
 $(OUT)\fs_utils.obj: $(AFSD)\fs_utils.c
        $(C2OBJ) $**
 
+DLLSDKLIBS =\
+    mpr.lib
+
 DLLLIBS =\
-       mpr.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\afs\TaLocale.lib
 
-$(DLLFILE): $(DLLOBJS)
-       $(DLLCONLINK) /DEF:afs_shl_ext.def $(DLLLIBS)
+$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
+       $(DLLCONLINK) /DEF:afs_shl_ext.def $(DLLSDKLIBS)
        $(DLLPREP)
 
 ############################################################################