From 62f922445d3501fff4320cc7c8d93b6cd1a6361e Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 16 Mar 2014 15:41:45 -0400 Subject: [PATCH 1/1] Windows: Platform specific MIDL output Add $(CPU) to the MIDL generated _c.c and _s.c output files to prevent conflicts. Change-Id: Ie10c85fa0b9cab19b107b44c2cf452925b8ee521 Reviewed-on: http://gerrit.openafs.org/10907 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsadmsvr/.gitignore | 4 ++-- src/WINNT/afsadmsvr/NTMakefile | 18 ++++++++---------- src/WINNT/afsd/.gitignore | 12 ++++++------ src/WINNT/afsd/NTMakefile | 28 ++++++++++++++-------------- src/WINNT/client_osi/.gitignore | 4 ++-- src/WINNT/client_osi/NTMakefile | 8 ++++---- src/auth/NTMakefile | 2 +- src/libafsauthent/NTMakefile | 2 +- 8 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/WINNT/afsadmsvr/.gitignore b/src/WINNT/afsadmsvr/.gitignore index 87f3858..d758da5 100644 --- a/src/WINNT/afsadmsvr/.gitignore +++ b/src/WINNT/afsadmsvr/.gitignore @@ -4,6 +4,6 @@ /iTaAfsAdmSvr.h /iTaAfsAdmSvrTypes.h -/iTaAfsAdmSvr_c.c -/iTaAfsAdmSvr_s.c +/iTaAfsAdmSvr_*_c.c +/iTaAfsAdmSvr_*_s.c diff --git a/src/WINNT/afsadmsvr/NTMakefile b/src/WINNT/afsadmsvr/NTMakefile index 77f204a..4c94cd3 100644 --- a/src/WINNT/afsadmsvr/NTMakefile +++ b/src/WINNT/afsadmsvr/NTMakefile @@ -52,7 +52,7 @@ LIBOBJS = \ $(OUT)\TaAfsAdmSvrClientPing.obj \ $(OUT)\TaAfsAdmSvrClientUser.obj \ $(OUT)\TaAfsAdmSvrCommon.obj \ - $(OUT)\iTaAfsAdmSvr_c.obj + $(OUT)\iTaAfsAdmSvr_$(CPU)_c.obj EXERES = $(OUT)\AfsAdmSvr.res @@ -71,12 +71,11 @@ EXEOBJS = \ $(OUT)\TaAfsAdmSvrProperties.obj \ $(OUT)\TaAfsAdmSvrSearch.obj \ $(OUT)\TaAfsAdmSvrUser.obj \ - $(OUT)\iTaAfsAdmSvr_s.obj + $(OUT)\iTaAfsAdmSvr_$(CPU)_s.obj VCLIBS =\ gdi32.lib \ user32.lib \ -# rpcns4.lib \ rpcrt4.lib \ comctl32.lib \ gdi32.lib @@ -106,11 +105,11 @@ MIDL_FLAGS=/ms_ext \ /WX \ /nologo -.SUFFIXES: .h .idl +ITaAfsAdmSvr.h ITaAfsAdmSvr_$(CPU)_c.c ITaAfsAdmSvr_$(CPU)_s.c: ITaAfsAdmSvr.idl + midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) -cstub ITaAfsAdmSvr_$(CPU)_c.c -sstub ITaAfsAdmSvr_$(CPU)_s.c $** -.idl.h: - echo [$<] - midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) $< +ITaAfsAdmSvrTypes.h ITaAfsAdmSvrTypes_$(CPU)_c.c ITaAfsAdmSvrTypes_$(CPU)_s.c: ITaAfsAdmSvrTypes.idl + midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) -cstub ITaAfsAdmSvrTypes_$(CPU)_c.c -sstub ITaAfsAdmSvrTypes_$(CPU)_s.c $** ############################################################################ @@ -159,9 +158,8 @@ install : \ $(EXEFILE) clean:: afsclass_clean afsapplib_clean - if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp - if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c - if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h + $(DEL) ITaAfsAdmSvr_$(CPU)_c.c ITaAfsAdmSvr_$(CPU)_s.c ITaAfsAdmSvr.h + $(DEL) ITaAfsAdmSvrTypes_$(CPU)_c.c ITaAfsAdmSvrTypes_$(CPU)_s.c ITaAfsAdmSvrTypes.h $(DEL) AFS_component_version_number.h $(DEL) $(EXERES) diff --git a/src/WINNT/afsd/.gitignore b/src/WINNT/afsd/.gitignore index f5819d7..85eacdb 100644 --- a/src/WINNT/afsd/.gitignore +++ b/src/WINNT/afsd/.gitignore @@ -6,11 +6,11 @@ /afsd_eventmessages.h /afsd_eventmessages.rc /afsrpc.h -/afsrpc_c.c -/afsrpc_s.c +/afsrpc_*_c.c +/afsrpc_*_s.c /ms-srvsvc.h -/ms-srvsvc_c.c -/ms-srvsvc_s.c +/ms-srvsvc_*_c.c +/ms-srvsvc_*_s.c /ms-wkssvc.h -/ms-wkssvc_c.c -/ms-wkssvc_s.c +/ms-wkssvc_*_c.c +/ms-wkssvc_*_s.c diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index c53079d..b4de390 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -84,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 \ @@ -102,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=\ @@ -152,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 @@ -160,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 \ @@ -655,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 diff --git a/src/WINNT/client_osi/.gitignore b/src/WINNT/client_osi/.gitignore index 1b1d571..fd4726e 100644 --- a/src/WINNT/client_osi/.gitignore +++ b/src/WINNT/client_osi/.gitignore @@ -3,5 +3,5 @@ # to check that you haven't inadvertently ignored any tracked files. /dbrpc.h -/dbrpc_c.c -/dbrpc_s.c +/dbrpc_*_c.c +/dbrpc_*_s.c diff --git a/src/WINNT/client_osi/NTMakefile b/src/WINNT/client_osi/NTMakefile index 4ae65c0..0a578f9 100644 --- a/src/WINNT/client_osi/NTMakefile +++ b/src/WINNT/client_osi/NTMakefile @@ -58,7 +58,7 @@ DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\libosi.dll ILIBDIR = $(DESTDIR)\lib DLLOBJS =\ - $(OUT)\dbrpc_s.obj \ + $(OUT)\dbrpc_$(CPU)_s.obj \ $(OUT)\osistatl.obj \ $(OUT)\osibasel.obj \ $(OUT)\osisleep.obj \ @@ -116,8 +116,8 @@ $(EXEFILE) : $(EXEOBJS) ############################################################################ # midl on dbrpc.idl -dbrpc.h dbrpc_c.c dbrpc_s.c: dbrpc.idl - $(MIDL) $(AFSDEV_AUXMIDLFLAGS) -Zp4 -cpp_cmd $(cc) -cpp_opt "-E" $** +dbrpc.h dbrpc_$(CPU)_c.c dbrpc_$(CPU)_s.c: dbrpc.idl + $(MIDL) $(AFSDEV_AUXMIDLFLAGS) -cstub dbrpc_$(CPU)_c.c -sstub dbrpc_$(CPU)_s.c -Zp4 -cpp_cmd $(cc) -cpp_opt "-E" $** ############################################################################ # generate versioninfo resources @@ -140,7 +140,7 @@ install_debug: $(OUT)\osidebug.res $(EXEFILE) # Local clean target; augments predefined clean target clean:: - $(DEL) dbrpc_s.c dbrpc_c.c dbrpc.h $(DLLFILE) $(INCFILES) $(OSIEVENTDLL) + $(DEL) dbrpc_$(CPU)_s.c dbrpc_$(CPU)_c.c dbrpc.h $(DLLFILE) $(INCFILES) $(OSIEVENTDLL) $(DEL) $(EXEOBJS) $(EXEFILE) $(OUT)\*.res $(OUT)\*.DLL diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index 0e77e0e..b0f36eb 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -51,7 +51,7 @@ AFSAUTH_LIBOBJS =\ $(OUT)\AFS_component_version_number.obj AFSDOBJS =\ - $(OUT)\$(AFSD)\afsrpc_c.obj + $(OUT)\$(AFSD)\afsrpc_$(CPU)_c.obj $(AFSDOBJS): $(AFSD)\$$(@B).c $(C2OBJ) -I$*(*D) $** diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile index 796415b..f1f055c 100644 --- a/src/libafsauthent/NTMakefile +++ b/src/libafsauthent/NTMakefile @@ -74,7 +74,7 @@ SYSOBJS = \ $(OUT)\pioctl_nt.obj WINNTAFSDOBJS =\ - $(OUT)\afsrpc_c.obj + $(OUT)\afsrpc_$(CPU)_c.obj DLLOBJS =\ $(AUTHOBJS) \ -- 1.7.1