winmad/inf: create inf file under bin/kernel

Winmad currently creates its inf file under core/winmad/kernel/obj*.
Move the inf file to bin/kernel/obj*.  This is the location where all
other inf files in the tree are created.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2548 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/core/winmad/kernel/SOURCES b/core/winmad/kernel/SOURCES
index e387657..653e0fa 100644 (file)
--- a/core/winmad/kernel/SOURCES
+++ b/core/winmad/kernel/SOURCES
@@ -4,7 +4,8 @@ TARGETTYPE = DRIVER
 \r
 KMDF_VERSION_MAJOR = 1\r
 INF_NAME = winmad\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/winmad/kernel/makefile.inc b/core/winmad/kernel/makefile.inc
index 017f962..81c144d 100644 (file)
--- a/core/winmad/kernel/makefile.inc
+++ b/core/winmad/kernel/makefile.inc
@@ -1,9 +1,13 @@
 _LNG=$(LANGUAGE)\r
+\r
+!IF !DEFINED(_INX)\r
 _INX=.\r
+!ENDIF\r
+\r
 STAMP=stampinf -f $@ -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) -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV) \r

diff --git a/core/winmad/kernel/winmad.inx b/core/winmad/kernel/winmad.inx
index 89427ae..4b53398 100644 (file)
--- a/core/winmad/kernel/winmad.inx
+++ b/core/winmad/kernel/winmad.inx
@@ -62,7 +62,7 @@ winmad.dll
 winmadd.dll\r
 \r
 [Manufacturer]\r
-%OFA% = WmModel\r
+%OFA% = WmModel, NT$ARCH$\r
 \r
 [WmModel]\r
 %winmad.DeviceDesc% = WmDevice, root\winmad\r