[ofa-general] [PATCH] libibmad: cleanup mad.h include path

[Sasha Khapyorsky]

Cleanup mad.h include path. Also improve some automake INCLUDES and
EXTRA_DIST definition - remove not needed stuff.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 libibmad/Makefile.am    |    4 ++--
 libibmad/src/dump.c     |    2 +-
 libibmad/src/fields.c   |    2 +-
 libibmad/src/gs.c       |    2 +-
 libibmad/src/mad.c      |    2 +-
 libibmad/src/portid.c   |    2 +-
 libibmad/src/register.c |    2 +-
 libibmad/src/resolve.c  |    2 +-
 libibmad/src/rpc.c      |    2 +-
 libibmad/src/sa.c       |    2 +-
 libibmad/src/serv.c     |    2 +-
 libibmad/src/smp.c      |    2 +-
 libibmad/src/vendor.c   |    2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libibmad/Makefile.am b/libibmad/Makefile.am
index beae1a4..74a8d10 100644
--- a/libibmad/Makefile.am
+++ b/libibmad/Makefile.am
@@ -1,7 +1,7 @@
 
 SUBDIRS = .
 
-INCLUDES = -I$(srcdir)/include/infiniband -I$(includedir)
+INCLUDES = -I$(srcdir)/include -I$(includedir)
 
 lib_LTLIBRARIES = libibmad.la
 
@@ -25,7 +25,7 @@ libibmadincludedir = $(includedir)/infiniband
 
 libibmadinclude_HEADERS = $(srcdir)/include/infiniband/mad.h
 
-EXTRA_DIST = $(srcdir)/include/infiniband/mad.h libibmad.spec.in libibmad.spec \
+EXTRA_DIST = libibmad.spec.in libibmad.spec \
 	$(srcdir)/src/libibmad.map libibmad.ver autogen.sh
 
 dist-hook:
diff --git a/libibmad/src/dump.c b/libibmad/src/dump.c
index 38a2254..1b94104 100644
--- a/libibmad/src/dump.c
+++ b/libibmad/src/dump.c
@@ -43,7 +43,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 void
 mad_dump_int(char *buf, int bufsz, void *val, int valsz)
diff --git a/libibmad/src/fields.c b/libibmad/src/fields.c
index 5cebd01..37a2b06 100644
--- a/libibmad/src/fields.c
+++ b/libibmad/src/fields.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 /*
  * BITSOFFS and BE_OFFS are required due the fact that the bit offsets are inconsistently
diff --git a/libibmad/src/gs.c b/libibmad/src/gs.c
index 9a89af2..629be3e 100644
--- a/libibmad/src/gs.c
+++ b/libibmad/src/gs.c
@@ -41,7 +41,7 @@
 #include <string.h>
 
 #include <infiniband/umad.h>
-#include "mad.h"
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG 	if (ibdebug)	IBWARN
diff --git a/libibmad/src/mad.c b/libibmad/src/mad.c
index be27c09..442343e 100644
--- a/libibmad/src/mad.c
+++ b/libibmad/src/mad.c
@@ -42,7 +42,7 @@
 #include <time.h>
 
 #include <infiniband/umad.h>
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG	if (ibdebug)	IBWARN
diff --git a/libibmad/src/portid.c b/libibmad/src/portid.c
index 61e6be0..76611fb 100644
--- a/libibmad/src/portid.c
+++ b/libibmad/src/portid.c
@@ -42,7 +42,7 @@
 #include <inttypes.h>
 #include <arpa/inet.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG	if (ibdebug)	IBWARN
diff --git a/libibmad/src/register.c b/libibmad/src/register.c
index 045f840..bddab6a 100644
--- a/libibmad/src/register.c
+++ b/libibmad/src/register.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 
 #include <infiniband/umad.h>
-#include "mad.h"
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG	if (ibdebug)	IBWARN
diff --git a/libibmad/src/resolve.c b/libibmad/src/resolve.c
index 906b28d..c641334 100644
--- a/libibmad/src/resolve.c
+++ b/libibmad/src/resolve.c
@@ -41,7 +41,7 @@
 #include <string.h>
 
 #include <infiniband/umad.h>
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG 	if (ibdebug)	IBWARN
diff --git a/libibmad/src/rpc.c b/libibmad/src/rpc.c
index 670a936..535e3d0 100644
--- a/libibmad/src/rpc.c
+++ b/libibmad/src/rpc.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 
 #include <infiniband/umad.h>
-#include "mad.h"
+#include <infiniband/mad.h>
 
 #define MAX_CLASS 256
 
diff --git a/libibmad/src/sa.c b/libibmad/src/sa.c
index c601254..baa6da7 100644
--- a/libibmad/src/sa.c
+++ b/libibmad/src/sa.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG 	if (ibdebug)	IBWARN
diff --git a/libibmad/src/serv.c b/libibmad/src/serv.c
index b329352..6865b81 100644
--- a/libibmad/src/serv.c
+++ b/libibmad/src/serv.c
@@ -42,7 +42,7 @@
 #include <netinet/in.h>
 
 #include <infiniband/umad.h>
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG	if (ibdebug)	IBWARN
diff --git a/libibmad/src/smp.c b/libibmad/src/smp.c
index ad6b066..b3314fb 100644
--- a/libibmad/src/smp.c
+++ b/libibmad/src/smp.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG 	if (ibdebug)	IBWARN
diff --git a/libibmad/src/vendor.c b/libibmad/src/vendor.c
index eb703f6..eb6eaf5 100644
--- a/libibmad/src/vendor.c
+++ b/libibmad/src/vendor.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <mad.h>
+#include <infiniband/mad.h>
 
 #undef DEBUG
 #define DEBUG 	if (ibdebug)	IBWARN
-- 
1.6.0.4.766.g6fc4a