afsifs-20050615

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

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 56e6199..a4b9683 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -62,10 +62,11 @@ INCFILES =\
        $(INCFILEDIR)\cm_dnlc.h \
        $(INCFILEDIR)\cm_buf.h \
        $(INCFILEDIR)\cm_freelance.h \
-    $(INCFILEDIR)\afsd_eventlog.h \
-    $(INCFILEDIR)\afsd_eventmessages.h \
-    $(INCFILEDIR)\afskfw.h \
-    $(INCFILEDIR)\afsicf.h
+        $(INCFILEDIR)\cm_memmap.h \
+        $(INCFILEDIR)\afsd_eventlog.h \
+        $(INCFILEDIR)\afsd_eventmessages.h \
+        $(INCFILEDIR)\afskfw.h \
+        $(INCFILEDIR)\afsicf.h
 
 IDLFILES =\
        afsrpc.h $(OUT)\afsrpc_c.obj
@@ -87,7 +88,15 @@ $(RXOBJS): $(RX)\$$(@B).c
 $(IDLFILES):afsrpc.idl
        midl $(MIDL_FLAGS) /no_robust $(AFSDEV_AUXMIDLFLAGS) /app_config $?
 
+RPCOBJS = $(OUT)\ifs_rpc.obj
+
+$(RPCOBJS):..\afsrdr\ifs_rpc.c
+       $(C2OBJ) ..\afsrdr\ifs_rpc.c
+
 AFSDOBJS=\
+        $(OUT)\ifs_rpc.obj \
+        $(OUT)\rawops.obj \
+        $(OUT)\afsdifs.obj \
        $(OUT)\afsd_init.obj \
        $(OUT)\cm_cell.obj \
        $(OUT)\cm_server.obj \
@@ -111,14 +120,15 @@ AFSDOBJS=\
        $(OUT)\cm_aclent.obj \
        $(OUT)\cm_dnlc.obj \
        $(OUT)\cm_rpc.obj \
+        $(OUT)\cm_memmap.obj \
        $(OUT)\afsrpc_s.obj \
 !IFDEF OSICRASH
        $(OUT)\afsdcrash.obj \
 !ENDIF
-    $(OUT)\cm_freelance.obj \
-    $(OUT)\afsd_eventlog.obj \
-    $(OUT)\afsd_flushvol.obj \
-    $(OUT)\afsicf.obj
+        $(OUT)\cm_freelance.obj \
+        $(OUT)\afsd_eventlog.obj \
+        $(OUT)\afsd_flushvol.obj \
+        $(OUT)\afsicf.obj
 
 $(AFSDOBJS):
 
@@ -127,6 +137,8 @@ $(OUT)\cm_conn.obj: cm_conn.c
 
 FSOBJS=$(OUT)\fs.obj $(OUT)\fs_utils.obj
 
+CMDBGOBJS=$(OUT)\cmdebug.obj
+
 SLOBJS=$(OUT)\symlink.obj $(OUT)\fs_utils.obj
 
 ILIBDIR = $(DESTDIR)\lib
@@ -209,15 +221,16 @@ $(AFSKFWLIB): $(AFSKFWLIB_OBJS)
 LOGON_DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\afslogon.dll
 
 LOGON_DLLOBJS =\
-       $(OUT)\afslogon.obj \
+    $(OUT)\afslogon.obj \
     $(OUT)\logon_ad.obj \
-       $(OUT)\afslogon.res
+    $(OUT)\afslogon.res
 
 LOGON_DLLLIBS =\
-       $(DESTDIR)\lib\afsauthent.lib \
-       $(DESTDIR)\lib\libafsconf.lib \
+    $(DESTDIR)\lib\afsauthent.lib \
+    $(DESTDIR)\lib\libafsconf.lib \
     $(DESTDIR)\lib\afsrxkad.lib \
     $(DESTDIR)\lib\afsdes.lib \
+    $(LANAHELPERLIB) \
     $(AFSKFWLIB)
 
 LOGON_DLLSDKLIBS =\
@@ -272,10 +285,12 @@ install: install_headers install_objs $(CONF_DLLFILE) \
        $(EXEDIR)\klog.exe \
        $(EXEDIR)\tokens.exe \
        $(EXEDIR)\unlog.exe $(EXEDIR)\afsd.exe $(EXEDIR)\afsd_service.exe \
-       $(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \
+       $(EXEDIR)\fs.exe \
+        $(EXEDIR)\symlink.exe \
+        $(EXEDIR)\afsdacl.exe \
        $(LOGON_DLLFILE) \
        $(EXEDIR)\afsshare.exe \
-       $(DESTDIR)\bin\kpasswd.exe
+       $(DESTDIR)\bin\kpasswd.exe $(EXEDIR)\cmdebug.exe $(EXEDIR)\afscpcc.exe
 
 install9X: install_headers $(CONF_DLLFILE) \
        $(EXEDIR)\klog.exe \
@@ -292,7 +307,7 @@ install_libutils: install_headers $(CONF_DLLFILE) \
        $(EXEDIR)\unlog.exe \
        $(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \
        $(EXEDIR)\afsshare.exe \
-       $(DESTDIR)\bin\kpasswd.exe
+       $(DESTDIR)\bin\kpasswd.exe $(EXEDIR)\cmdebug.exe
 
 ############################################################################
 # Local clean target; augments predefined clean target
@@ -318,26 +333,45 @@ EXELIBS = \
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\libafsconf.lib
 
+EXELIBS2 = \
+        $(DESTDIR)\lib\afsrpc.lib \
+       $(DESTDIR)\lib\afs\afsprot.lib \
+       $(DESTDIR)\lib\afs\afspioctl.lib \
+       $(DESTDIR)\lib\afs\afscom_err.lib \
+       $(DESTDIR)\lib\afs\afscmd.lib \
+       $(DESTDIR)\lib\afs\afsutil.lib \
+       $(DESTDIR)\lib\afsubik.lib \
+       $(DESTDIR)\lib\afsrxkad.lib \
+       $(DESTDIR)\lib\afsdes.lib \
+       $(DESTDIR)\lib\afslwp.lib \
+       $(DESTDIR)\lib\libosi.lib \
+       $(DESTDIR)\lib\libafsconf.lib
+
 # klog.exe
 $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
        $(EXEPREP)
 
 # tokens.exe
 $(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
        $(EXEPREP)
 
 # unlog.exe
 $(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXEPREP)
+
+# afscpcc.exe
+$(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS)
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
        $(EXEPREP)
 
+
 # afsd.exe
 AFSD_EXEFILE = $(EXEDIR)\afsd.exe
 
 AFSD_SDKLIBS =\
-#      largeint.lib \
        netapi32.lib \
         dnsapi.lib \
         mpr.lib \
@@ -349,7 +383,7 @@ AFSD_SDKLIBS =\
         secur32.lib \
         ole32.lib \
         oleaut32.lib \
-        psapi.lib wintrust.lib
+        iphlpapi.lib
 
 AFSD_EXELIBS =\
        $(DESTDIR)\lib\libosi.lib \
@@ -368,17 +402,22 @@ $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS) $(AFSD_E
 
 # afsd_service.exe
 $(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res  $(RXOBJS) $(AFSD_EXELIBS)
-       $(EXECONLINK) $(AFSD_SDKLIBS) /MAP 
+       $(EXECONLINK) $(AFSD_SDKLIBS) /MAP /LARGEADDRESSAWARE
        $(EXEPREP)
 
 # fs.exe
 $(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+       $(EXEPREP)
+
+# cmdebug.exe
+$(EXEDIR)\cmdebug.exe: $(CMDBGOBJS) $(OUT)\cmdebug.res $(EXELIBS2)
+       $(EXECONLINK) $(EXELIBS2) dnsapi.lib mpr.lib iphlpapi.lib rpcrt4.lib
        $(EXEPREP)
 
 # symlink.exe
 $(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res  $(EXELIBS)
-       $(EXECONLINK) dnsapi.lib mpr.lib
+       $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
        $(EXEPREP)
 
 # afsshare.exe
@@ -386,6 +425,11 @@ $(EXEDIR)\afsshare.exe: $(OUT)\afsshare.obj $(OUT)\afsshare.res
        $(EXECONLINK)
        $(EXEPREP)
 
+# afsdacl.exe
+$(EXEDIR)\afsdacl.exe: $(OUT)\afsdacl.obj $(OUT)\afsdacl.res
+       $(EXECONLINK)
+       $(EXEPREP)
+
 # kpasswd.exe - built in kauth, but rebuild here to make pthread-based,
 #    which is required for Windows 95.  At some point it would be nice
 #    for all commands to be pthread based, in which case they should
@@ -404,7 +448,7 @@ KPASSWD_OBJS =\
 KPASSWD_LIBS =\
        $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afsrpc.lib \
-    $(DESTDIR)\lib\afsrx.lib \
+        $(DESTDIR)\lib\afsrx.lib \
        $(DESTDIR)\lib\afs\afscmd.lib \
        $(DESTDIR)\lib\afsdes.lib \
        $(DESTDIR)\lib\afs\afsutil.lib
@@ -442,6 +486,8 @@ $(OUT)\tokens.res: tokens.rc AFS_component_version_number.h
 
 $(OUT)\unlog.res: unlog.rc AFS_component_version_number.h
 
+$(OUT)\afscpcc.res: afscpcc.rc AFS_component_version_number.h
+
 afsd_eventmessages.rc: afsd_eventmessages.h
 
 $(OUT)\afsd_service.res: afsd_service.rc afsd_eventmessages.rc AFS_component_version_number.h
@@ -457,7 +503,7 @@ clean::
        $(DEL) $(OUT)\*.res
        $(DEL) afsrpc.h
        $(DEL) afsrpc_?.*
-    $(DEL) afsd_eventmessages.h
+        $(DEL) afsd_eventmessages.h
        $(DEL) $(CONF_DLLFILE)
        $(DEL) $(LOGON_DLLFILE)
        $(DEL) $(LOG95_DLLFILE)