Windows: Update fs newcell and add VIOCNEWCELL2

[openafs.git] / src / WINNT / afsd / NTMakefile

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 4603251..ba429a6 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -93,10 +93,10 @@ $(IDLFILES):afsrpc.idl
        midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /app_config $?
 
 ms-srvsvc.h ms-srvsvc_s.c: ms-srvsvc.idl
-       midl /Os ms-srvsvc.idl
+       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os ms-srvsvc.idl
 
 ms-wkssvc.h ms-wkssvc_s.c: ms-wkssvc.idl
-       midl /Os ms-wkssvc.idl
+       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os ms-wkssvc.idl
 
 $(OUT)\ms-srvsvc_s.obj: ms-srvsvc_s.c
        $(C2OBJ) /FImsrpc.h /Fo$@ $**
@@ -179,7 +179,7 @@ ILIBDIR = $(DESTDIR)\lib
 #                                                    
 $(INCFILEDIR)\afsd_eventmessages.h:  afsd_eventmessages.mc         
        mc afsd_eventmessages.mc                           
-                                                     
+
 ############################################################################
 #
 # Flags for linking LOGON DLL'S
@@ -204,6 +204,23 @@ MIDL_FLAGS=/app_config \
 .idl.h:
        midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) $<
 
+
+AFSD_SDKLIBS =\
+        netapi32.lib \
+        dnsapi.lib \
+        mpr.lib \
+        rpcrt4.lib \
+        user32.lib \
+        Dbghelp.lib \
+        strsafe.lib \
+        mpr.lib \
+        secur32.lib \
+        ole32.lib \
+        oleaut32.lib \
+        iphlpapi.lib \
+        shell32.lib \
+        shlwapi.lib
+
 ############################################################################
 # libafsconf.dll
 
@@ -214,7 +231,7 @@ CONF_DLLLIBS = \
     $(DESTDIR)\lib\afs\afsreg.lib
 
 $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
-       $(DLLGUILINK) -def:libafsconf.def dnsapi.lib mpr.lib shell32.lib
+       $(DLLGUILINK) -def:libafsconf.def  $(AFSD_SDKLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
@@ -400,20 +417,6 @@ $(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS)
 # afsd.exe
 AFSD_EXEFILE = $(EXEDIR)\afsd.exe
 
-AFSD_SDKLIBS =\
-       netapi32.lib \
-        dnsapi.lib \
-        mpr.lib \
-       rpcrt4.lib \
-       user32.lib \
-        Dbghelp.lib \
-        strsafe.lib \
-        mpr.lib \
-        secur32.lib \
-        ole32.lib \
-        oleaut32.lib \
-        iphlpapi.lib shell32.lib shlwapi.lib
-
 AFSD_EXELIBS =\
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\afs\mtafsvldb.lib \
@@ -424,7 +427,6 @@ AFSD_EXELIBS =\
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\afspthread.lib \
-        $(DESTDIR)\lib\afs\afstvolser.lib \
         $(LANAHELPERLIB)
 
 $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS) $(AFSD_EXELIBS)