Windows: Platform specific MIDL output

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

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index a234022..b4de390 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -32,6 +32,7 @@ INCFILES =\
        $(INCFILEDIR)\cm_conn.h \
        $(INCFILEDIR)\cm_error.h \
        $(INCFILEDIR)\cm_ioctl.h \
+       $(INCFILEDIR)\cm_getaddrs.h \
        $(INCFILEDIR)\cm_scache.h \
        $(INCFILEDIR)\cm_server.h \
        $(INCFILEDIR)\cm_user.h \
@@ -83,7 +84,7 @@ $(INCFILEDIR)\krbcompat_delayload.h: $(HEIMINC)\krbcompat_delayload.h
         $(COPY) $< $@
 
 IDLFILES =\
-       afsrpc.h $(OUT)\afsrpc_c.obj
+       afsrpc.h $(OUT)\afsrpc_$(CPU)_c.obj
 
 CONFOBJS=$(OUT)\cm_config.obj \
          $(OUT)\cm_dns.obj \
@@ -101,18 +102,18 @@ $(RXOBJS): $(RX)\$$(@B).c
        $(C2OBJ) -I$(RX) $**
 
 $(IDLFILES):afsrpc.idl
-       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /app_config $?
+       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /app_config /cstub afsrpc_$(CPU)_c.c /sstub afsrpc_$(CPU)_s.c $?
 
-ms-srvsvc.h ms-srvsvc_s.c: ms-srvsvc.idl
-       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os ms-srvsvc.idl
+ms-srvsvc.h ms-srvsvc_$(CPU)_s.c: ms-srvsvc.idl
+       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os /cstub ms-srvsvc_$(CPU)_c.c /sstub ms-srvsvc_$(CPU)_s.c ms-srvsvc.idl
 
-ms-wkssvc.h ms-wkssvc_s.c: ms-wkssvc.idl
-       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os ms-wkssvc.idl
+ms-wkssvc.h ms-wkssvc_$(CPU)_s.c: ms-wkssvc.idl
+       midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /Os /cstub ms-wkssvc_$(CPU)_c.c /sstub ms-wkssvc_$(CPU)_s.c ms-wkssvc.idl
 
-$(OUT)\ms-srvsvc_s.obj: ms-srvsvc_s.c
+$(OUT)\ms-srvsvc_$(CPU)_s.obj: ms-srvsvc_$(CPU)_s.c
        $(C2OBJ) /FImsrpc.h /Fo$@ $**
 
-$(OUT)\ms-wkssvc_s.obj: ms-wkssvc_s.c
+$(OUT)\ms-wkssvc_$(CPU)_s.obj: ms-wkssvc_$(CPU)_s.c
        $(C2OBJ) /FImsrpc.h /Fo$@ $**
 
 AFSDOBJS=\
@@ -132,6 +133,7 @@ AFSDOBJS=\
         $(OUT)\cm_direct.obj \
        $(OUT)\cm_access.obj \
        $(OUT)\cm_eacces.obj \
+       $(OUT)\cm_getaddrs.obj \
        $(OUT)\cm_callback.obj \
        $(OUT)\cm_vnodeops.obj \
        $(OUT)\cm_dir.obj \
@@ -150,7 +152,7 @@ AFSDOBJS=\
         $(OUT)\cm_memmap.obj \
         $(OUT)\cm_performance.obj \
         $(OUT)\cm_nls.obj \
-       $(OUT)\afsrpc_s.obj \
+       $(OUT)\afsrpc_$(CPU)_s.obj \
 !IFDEF OSICRASH
        $(OUT)\afsdcrash.obj \
 !ENDIF
@@ -158,8 +160,8 @@ AFSDOBJS=\
         $(OUT)\afsd_eventlog.obj \
         $(OUT)\afsd_flushvol.obj \
         $(OUT)\afsicf.obj \
-       $(OUT)\ms-srvsvc_s.obj \
-       $(OUT)\ms-wkssvc_s.obj \
+       $(OUT)\ms-srvsvc_$(CPU)_s.obj \
+       $(OUT)\ms-wkssvc_$(CPU)_s.obj \
        $(OUT)\rpc_wkssvc.obj \
        $(OUT)\rpc_srvsvc.obj \
         $(OUT)\AFS_component_version_number.obj \
@@ -335,6 +337,7 @@ LOGON_DLLLIBS =\
     $(DESTDIR)\lib\afs\afsutil.lib \
     $(DESTDIR)\lib\opr.lib \
     $(DESTDIR)\lib\afsroken.lib \
+    $(DESTDIR)\lib\afsrpc.lib \
     $(LANAHELPERLIB) \
     $(AFSKFWLIB)
 
@@ -421,17 +424,18 @@ EXELIBS = \
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\opr.lib \
        $(DESTDIR)\lib\afshcrypto.lib \
-       $(DESTDIR)\lib\afsroken.lib
+       $(DESTDIR)\lib\afsroken.lib \
+       $(DESTDIR)\lib\afsrfc3961.lib
 
 EXELIBS2 = \
         $(DESTDIR)\lib\afsrpc.lib \
+        $(DESTDIR)\lib\afsauthent.lib \
+       $(DESTDIR)\lib\afs\mtafsint.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\afs\mtafsutil.lib \
        $(DESTDIR)\lib\afslwp.lib \
        $(DESTDIR)\lib\libosi.lib \
        $(DESTDIR)\lib\libafsconf.lib \
@@ -439,12 +443,7 @@ EXELIBS2 = \
        $(DESTDIR)\lib\afshcrypto.lib \
        $(DESTDIR)\lib\afsroken.lib
 
-EXELIBS3 = \
-       $(DESTDIR)\lib\afs\afscmd.lib \
-       $(DESTDIR)\lib\afsrxkad.lib \
-       $(DESTDIR)\lib\opr.lib \
-       $(DESTDIR)\lib\afshcrypto.lib \
-       $(DESTDIR)\lib\afsroken.lib
+LIBCMD = $(DESTDIR)\lib\afs\afscmd.lib
 
 # klog.exe
 $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(DESTDIR)\lib\krbcompat_delayload.obj $(EXELIBS) $(HEIMDEPS)
@@ -484,12 +483,11 @@ AFSD_EXEFILE = $(EXEDIR)\afsd.exe
 
 AFSD_EXELIBS =\
        $(DESTDIR)\lib\libosi.lib \
+       $(DESTDIR)\lib\afsrpc.lib \
+       $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\afs\mtafsvldb.lib \
        $(DESTDIR)\lib\afs\mtafsint.lib \
-       $(DESTDIR)\lib\afsrpc.lib \
-        $(DESTDIR)\lib\afsrxkad.lib \
        $(DESTDIR)\lib\afs\mtafsutil.lib \
-       $(DESTDIR)\lib\afsauthent.lib \
        $(DESTDIR)\lib\libafsconf.lib \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\afspthread.lib \
@@ -547,7 +545,7 @@ KFWLIBS = \
 LINKOPTS = /DELAYLOAD:krbv4w32.dll /DELAYLOAD:krb5_32.dll /DELAYLOAD:comerr32.dll
 !endif
 
-$(EXEDIR)\afsio.exe: $(AFSIOOBJS) $(OUT)\afsio.res $(RXOBJS) $(AFSD_EXELIBS) $(EXELIBS3) $(AFSCPLIB)
+$(EXEDIR)\afsio.exe: $(AFSIOOBJS) $(OUT)\afsio.res $(RXOBJS) $(AFSD_EXELIBS) $(LIBCMD) $(AFSCPLIB)
        $(EXECONLINK) $(KFWLIBS) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib rpcrt4.lib
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
@@ -657,11 +655,11 @@ $(OUT)\libafsconf.res: libafsconf.rc AFS_component_version_number.h
 clean::
        $(DEL) $(OUT)\*.res
        $(DEL) afsrpc.h
-       $(DEL) afsrpc_?.*
+       $(DEL) afsrpc_$(CPU)_?.*
        $(DEL) ms-srvsvc.h
-       $(DEL) ms-srvsvc_?.*
+       $(DEL) ms-srvsvc_$(CPU)_?.*
        $(DEL) ms-wkssvc.h
-       $(DEL) ms-wkssvc_?.*
+       $(DEL) ms-wkssvc_$(CPU)_?.*
         $(DEL) afsd_eventmessages.h
         $(DEL) afsd_eventmessages.rc
         $(DEL) MSG?????.bin