[OPENSM] Setup opensm\user\mad-vendor.inc as the single-point of OSM vendor definitio...

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

diff --git a/trunk/ulp/opensm/user/ibtrapgen/SOURCES b/trunk/ulp/opensm/user/ibtrapgen/SOURCES
index 131bd5e357df2d81c1dff4c934a7f7a58bf4b29f..b479a7086233ac044277e93f23b36cd3933a11db 100644 (file)
--- a/trunk/ulp/opensm/user/ibtrapgen/SOURCES
+++ b/trunk/ulp/opensm/user/ibtrapgen/SOURCES
@@ -16,10 +16,7 @@ TARGETPATH=$(OSM_TARGET)\bin\user\obj$(BUILD_ALT_DIR)
 TARGETPATH=$(WINIBHOME)\bin\user\obj$(BUILD_ALT_DIR)\r
 !endif\r
 \r
-# include only one vendor definition\r
-\r
-!include ..\opensm\vendor-ibal.inc\r
-#!include ..\opensm\vendor-umad.inc\r
+!INCLUDE ..\mad-vendor.inc\r
 \r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
@@ -54,7 +51,7 @@ INCLUDES= \
        $(WINIBHOME)\inc\user\linux; \\r
        $(VENDOR_INC); \\r
        $(OSM_HOME); \\r
-       $(OSM_HOME)\include; \\r
+       $(OSM_HOME)\include;\r
 \r
 # Could be any special flag needed for this project \r
 USER_C_FLAGS=$(USER_C_FLAGS) /MD\r

diff --git a/trunk/ulp/opensm/user/ibtrapgen/vendor-ibal.inc b/trunk/ulp/opensm/user/ibtrapgen/vendor-ibal.inc
new file mode 100644 (file)
index 0000000..303cdd4
--- /dev/null
+++ b/trunk/ulp/opensm/user/ibtrapgen/vendor-ibal.inc
@@ -0,0 +1,2 @@
+\r
+!INCLUDE ..\opensm\vendor-ibal.inc\r

diff --git a/trunk/ulp/opensm/user/ibtrapgen/vendor-umad.inc b/trunk/ulp/opensm/user/ibtrapgen/vendor-umad.inc
new file mode 100644 (file)
index 0000000..d106d80
--- /dev/null
+++ b/trunk/ulp/opensm/user/ibtrapgen/vendor-umad.inc
@@ -0,0 +1,2 @@
+\r
+!INCLUDE ..\opensm\vendor-umad.inc\r

diff --git a/trunk/ulp/opensm/user/libvendor/SOURCES b/trunk/ulp/opensm/user/libvendor/SOURCES
index 3bc807892bf494f45dd7191ac0cd3f1179a05b93..e6c9cd56567ef305313b382586c2e94017152875 100644 (file)
--- a/trunk/ulp/opensm/user/libvendor/SOURCES
+++ b/trunk/ulp/opensm/user/libvendor/SOURCES
@@ -12,10 +12,7 @@ TARGETPATH=$(OSM_TARGET)\bin\user\obj$(BUILD_ALT_DIR)
 TARGETPATH=$(LIBPATH)\r
 !endif\r
 \r
-# include only one vendor definition\r
-\r
-!include vendor-ibal.inc\r
-#!include vendor-umad.inc\r
+!INCLUDE ..\mad-vendor.inc\r
 \r
 TARGETNAME=$(VENDOR_LIB)\r
 TARGETTYPE=LIBRARY\r

diff --git a/trunk/ulp/opensm/user/mad-vendor.inc b/trunk/ulp/opensm/user/mad-vendor.inc
new file mode 100644 (file)
index 0000000..b5fc920
--- /dev/null
+++ b/trunk/ulp/opensm/user/mad-vendor.inc
@@ -0,0 +1,6 @@
+\r
+# include only 'one' mad vendor.\r
+\r
+!INCLUDE vendor-ibal.inc\r
+\r
+#!INCLUDE vendor-umad.inc\r

diff --git a/trunk/ulp/opensm/user/opensm/SOURCES b/trunk/ulp/opensm/user/opensm/SOURCES
index 3c6d72525075208efb97720f85ae59d523b03f60..1f0ad9404d63c878eafcff90d451574583a08cb5 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/SOURCES
+++ b/trunk/ulp/opensm/user/opensm/SOURCES
@@ -13,10 +13,7 @@ TARGETPATH=$(OSM_TARGET)\bin\user\obj$(BUILD_ALT_DIR)
 TARGETPATH=$(LIBPATH)\r
 !endif\r
 \r
-# include one Vendor or the other; not both!\r
-\r
-!include vendor-ibal.inc\r
-#!include vendor-umad.inc\r
+!include ..\mad-vendor.inc\r
 \r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r

diff --git a/trunk/ulp/opensm/user/osmtest/SOURCES b/trunk/ulp/opensm/user/osmtest/SOURCES
index 35c99fd65c90fd448b54eba253ff403268c0fabe..1027e8d7f7bf2f138995be70c723e964f803be9b 100644 (file)
--- a/trunk/ulp/opensm/user/osmtest/SOURCES
+++ b/trunk/ulp/opensm/user/osmtest/SOURCES
@@ -12,10 +12,7 @@ TARGETPATH=$(OSM_TARGET)\bin\user\obj$(BUILD_ALT_DIR)
 TARGETPATH=$(WINIBHOME)\bin\user\obj$(BUILD_ALT_DIR)\r
 !endif\r
 \r
-# include only one vendor definition\r
-\r
-!include ..\opensm\vendor-ibal.inc\r
-#!include ..\opensm\vendor-umad.inc\r
+!include ..\mad-vendor.inc\r
 \r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
@@ -30,7 +27,7 @@ SOURCES=osmtest.rc \
        osmt_multicast.c \\r
        osmt_inform.c \\r
        osmtest.c \\r
-       main.c \\r
+       main.c\r
 \r
 OSM_HOME=..\r
 \r

diff --git a/trunk/ulp/opensm/user/osmtest/vendor-ibal.inc b/trunk/ulp/opensm/user/osmtest/vendor-ibal.inc
new file mode 100644 (file)
index 0000000..303cdd4
--- /dev/null
+++ b/trunk/ulp/opensm/user/osmtest/vendor-ibal.inc
@@ -0,0 +1,2 @@
+\r
+!INCLUDE ..\opensm\vendor-ibal.inc\r

diff --git a/trunk/ulp/opensm/user/osmtest/vendor-umad.inc b/trunk/ulp/opensm/user/osmtest/vendor-umad.inc
new file mode 100644 (file)
index 0000000..d106d80
--- /dev/null
+++ b/trunk/ulp/opensm/user/osmtest/vendor-umad.inc
@@ -0,0 +1,2 @@
+\r
+!INCLUDE ..\opensm\vendor-umad.inc\r