diff mbox series

[rdma-core,15/20] libibmad: Flatten libibmad into one directory

Message ID 20190514234936.5175-16-jgg@ziepe.ca (mailing list archive)
State Not Applicable
Headers show
Series Incorporate infiniband-diags into rdma-core | expand

Commit Message

Jason Gunthorpe May 14, 2019, 11:49 p.m. UTC 
From: Jason Gunthorpe <jgg@mellanox.com>

As is the standard for rdma-core

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---
 CMakeLists.txt                                              | 2 +-
 {ibdiags/libibmad/src => libibmad}/CMakeLists.txt           | 4 ++--
 {ibdiags/libibmad/src => libibmad}/bm.c                     | 0
 {ibdiags/libibmad/src => libibmad}/cc.c                     | 0
 {ibdiags/libibmad/src => libibmad}/dump.c                   | 0
 {ibdiags/libibmad/src => libibmad}/fields.c                 | 0
 {ibdiags/libibmad/src => libibmad}/gs.c                     | 0
 {ibdiags/libibmad/src => libibmad}/iba_types.h              | 0
 {ibdiags/libibmad/src => libibmad}/libibmad.map             | 0
 {ibdiags/libibmad/src => libibmad}/mad.c                    | 0
 {ibdiags/libibmad/include/infiniband => libibmad}/mad.h     | 0
 {ibdiags/libibmad/src => libibmad}/mad_internal.h           | 0
 {ibdiags/libibmad/include/infiniband => libibmad}/mad_osd.h | 0
 {ibdiags/libibmad/src => libibmad}/portid.c                 | 0
 {ibdiags/libibmad/src => libibmad}/register.c               | 0
 {ibdiags/libibmad/src => libibmad}/resolve.c                | 0
 {ibdiags/libibmad/src => libibmad}/rpc.c                    | 0
 {ibdiags/libibmad/src => libibmad}/sa.c                     | 0
 {ibdiags/libibmad/src => libibmad}/serv.c                   | 0
 {ibdiags/libibmad/src => libibmad}/smp.c                    | 0
 {ibdiags/libibmad/src => libibmad}/vendor.c                 | 0
 21 files changed, 3 insertions(+), 3 deletions(-)
 rename {ibdiags/libibmad/src => libibmad}/CMakeLists.txt (86%)
 rename {ibdiags/libibmad/src => libibmad}/bm.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/cc.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/dump.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/fields.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/gs.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/iba_types.h (100%)
 rename {ibdiags/libibmad/src => libibmad}/libibmad.map (100%)
 rename {ibdiags/libibmad/src => libibmad}/mad.c (100%)
 rename {ibdiags/libibmad/include/infiniband => libibmad}/mad.h (100%)
 rename {ibdiags/libibmad/src => libibmad}/mad_internal.h (100%)
 rename {ibdiags/libibmad/include/infiniband => libibmad}/mad_osd.h (100%)
 rename {ibdiags/libibmad/src => libibmad}/portid.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/register.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/resolve.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/rpc.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/sa.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/serv.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/smp.c (100%)
 rename {ibdiags/libibmad/src => libibmad}/vendor.c (100%)
diff mbox series

Patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd9355787291c0..a5c1dc7f1e2421 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,7 +617,7 @@  add_subdirectory(providers/ipathverbs)
 add_subdirectory(providers/rxe)
 add_subdirectory(providers/rxe/man)
 
-add_subdirectory(ibdiags/libibmad/src)
+add_subdirectory(libibmad)
 add_subdirectory(ibdiags/libibnetdisc/src)
 add_subdirectory(ibdiags/libibnetdisc/man)
 add_subdirectory(ibdiags/src)
diff --git a/ibdiags/libibmad/src/CMakeLists.txt b/libibmad/CMakeLists.txt
similarity index 86%
rename from ibdiags/libibmad/src/CMakeLists.txt
rename to libibmad/CMakeLists.txt
index 81fa4a366fc3c7..43d560a43d0a2e 100644
--- a/ibdiags/libibmad/src/CMakeLists.txt
+++ b/libibmad/CMakeLists.txt
@@ -1,6 +1,6 @@ 
 publish_headers(infiniband
-  ../include/infiniband/mad.h
-  ../include/infiniband/mad_osd.h
+  mad.h
+  mad_osd.h
   )
 
 publish_internal_headers(util
diff --git a/ibdiags/libibmad/src/bm.c b/libibmad/bm.c
similarity index 100%
rename from ibdiags/libibmad/src/bm.c
rename to libibmad/bm.c
diff --git a/ibdiags/libibmad/src/cc.c b/libibmad/cc.c
similarity index 100%
rename from ibdiags/libibmad/src/cc.c
rename to libibmad/cc.c
diff --git a/ibdiags/libibmad/src/dump.c b/libibmad/dump.c
similarity index 100%
rename from ibdiags/libibmad/src/dump.c
rename to libibmad/dump.c
diff --git a/ibdiags/libibmad/src/fields.c b/libibmad/fields.c
similarity index 100%
rename from ibdiags/libibmad/src/fields.c
rename to libibmad/fields.c
diff --git a/ibdiags/libibmad/src/gs.c b/libibmad/gs.c
similarity index 100%
rename from ibdiags/libibmad/src/gs.c
rename to libibmad/gs.c
diff --git a/ibdiags/libibmad/src/iba_types.h b/libibmad/iba_types.h
similarity index 100%
rename from ibdiags/libibmad/src/iba_types.h
rename to libibmad/iba_types.h
diff --git a/ibdiags/libibmad/src/libibmad.map b/libibmad/libibmad.map
similarity index 100%
rename from ibdiags/libibmad/src/libibmad.map
rename to libibmad/libibmad.map
diff --git a/ibdiags/libibmad/src/mad.c b/libibmad/mad.c
similarity index 100%
rename from ibdiags/libibmad/src/mad.c
rename to libibmad/mad.c
diff --git a/ibdiags/libibmad/include/infiniband/mad.h b/libibmad/mad.h
similarity index 100%
rename from ibdiags/libibmad/include/infiniband/mad.h
rename to libibmad/mad.h
diff --git a/ibdiags/libibmad/src/mad_internal.h b/libibmad/mad_internal.h
similarity index 100%
rename from ibdiags/libibmad/src/mad_internal.h
rename to libibmad/mad_internal.h
diff --git a/ibdiags/libibmad/include/infiniband/mad_osd.h b/libibmad/mad_osd.h
similarity index 100%
rename from ibdiags/libibmad/include/infiniband/mad_osd.h
rename to libibmad/mad_osd.h
diff --git a/ibdiags/libibmad/src/portid.c b/libibmad/portid.c
similarity index 100%
rename from ibdiags/libibmad/src/portid.c
rename to libibmad/portid.c
diff --git a/ibdiags/libibmad/src/register.c b/libibmad/register.c
similarity index 100%
rename from ibdiags/libibmad/src/register.c
rename to libibmad/register.c
diff --git a/ibdiags/libibmad/src/resolve.c b/libibmad/resolve.c
similarity index 100%
rename from ibdiags/libibmad/src/resolve.c
rename to libibmad/resolve.c
diff --git a/ibdiags/libibmad/src/rpc.c b/libibmad/rpc.c
similarity index 100%
rename from ibdiags/libibmad/src/rpc.c
rename to libibmad/rpc.c
diff --git a/ibdiags/libibmad/src/sa.c b/libibmad/sa.c
similarity index 100%
rename from ibdiags/libibmad/src/sa.c
rename to libibmad/sa.c
diff --git a/ibdiags/libibmad/src/serv.c b/libibmad/serv.c
similarity index 100%
rename from ibdiags/libibmad/src/serv.c
rename to libibmad/serv.c
diff --git a/ibdiags/libibmad/src/smp.c b/libibmad/smp.c
similarity index 100%
rename from ibdiags/libibmad/src/smp.c
rename to libibmad/smp.c
diff --git a/ibdiags/libibmad/src/vendor.c b/libibmad/vendor.c
similarity index 100%
rename from ibdiags/libibmad/src/vendor.c
rename to libibmad/vendor.c