[WINVERBS] support Winverbs installation - retarget .inf file to be co-resident with...

  makefile.inc
  SOURCES

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1490 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/core/winverbs/kernel/SOURCES b/core/winverbs/kernel/SOURCES
index bf47175..721f76f 100644 (file)
--- a/core/winverbs/kernel/SOURCES
+++ b/core/winverbs/kernel/SOURCES
@@ -4,7 +4,8 @@ TARGETTYPE = DRIVER
 \r
 KMDF_VERSION_MAJOR = 1\r
 INF_NAME = winverbs\r
-NTTARGETFILES = $(OBJ_PATH)\$(O)\$(INF_NAME).inf\r
+INF_TARGET=..\..\..\bin\kernel\$(O)\$(INF_NAME).inf\r
+NTTARGETFILES = $(INF_TARGET)\r
 MISCFILES = $(NTTARGETFILES)\r
 TARGETLIBS = $(TARGETLIBS) \\r
                         $(DDK_LIB_PATH)\wdmsec.lib             \\r

diff --git a/core/winverbs/kernel/makefile.inc b/core/winverbs/kernel/makefile.inc
index 4986bef..400aaaf 100644 (file)
--- a/core/winverbs/kernel/makefile.inc
+++ b/core/winverbs/kernel/makefile.inc
@@ -1,7 +1,13 @@
 _LNG=$(LANGUAGE)\r
+\r
+!IF !DEFINED(_INX)\r
 _INX=.\r
-STAMP=stampinf -f $@ -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)\r
+!ENDIF\r
+\r
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)\r
+\r
+!INCLUDE mod_ver.def\r
 \r
-$(OBJ_PATH)\$(O)\$(INF_NAME).inf: $(_INX)\$(INF_NAME).inx \r
+$(INF_TARGET) : $(_INX)\$(INF_NAME).inx \r
     copy $(_INX)\$(@B).inx $@\r
-    $(STAMP)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV) \r