srp_deamon: Flatten srp_daemon/src,etc into srp_daemon/

Since the directory only produces one program. Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
tatyana-en · Oct 6, 2016 · b8463ec · b8463ec
1 parent 1b0b3b1
commit b8463ec
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -282,8 +282,7 @@ add_subdirectory(libibcm/examples)
 add_subdirectory(libibumad/tests)
 add_subdirectory(libibverbs/examples)
 add_subdirectory(librdmacm/examples)
-add_subdirectory(srp_daemon/srp_daemon)
-add_subdirectory(srp_daemon/man)
+add_subdirectory(srp_daemon)
 
 rdma_finalize_libs()
 

diff --git a/srp_daemon/srp_daemon/CMakeLists.txt → srp_daemon/CMakeLists.txt b/srp_daemon/srp_daemon/CMakeLists.txt → srp_daemon/CMakeLists.txt
@@ -1,5 +1,10 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NO_STRICT_ALIASING_FLAGS}")
 
+rdma_man_pages(
+  ibsrpdm.1
+  srp_daemon.1.in
+  )
+
 rdma_sbin_executable(srp_daemon
   srp_daemon.c
   srp_handle_traps.c

diff --git a/srp_daemon/man/ibsrpdm.1 → srp_daemon/ibsrpdm.1 b/srp_daemon/man/ibsrpdm.1 → srp_daemon/ibsrpdm.1
diff --git a/srp_daemon/srp_daemon/logrotate-srp_daemon → srp_daemon/logrotate-srp_daemon b/srp_daemon/srp_daemon/logrotate-srp_daemon → srp_daemon/logrotate-srp_daemon
diff --git a/srp_daemon/man/CMakeLists.txt b/srp_daemon/man/CMakeLists.txt
diff --git a/...daemon/srp_daemon/rsyslog-srp_daemon.conf → srp_daemon/rsyslog-srp_daemon.conf b/...daemon/srp_daemon/rsyslog-srp_daemon.conf → srp_daemon/rsyslog-srp_daemon.conf
diff --git a/srp_daemon/man/srp_daemon.1.in → srp_daemon/srp_daemon.1.in b/srp_daemon/man/srp_daemon.1.in → srp_daemon/srp_daemon.1.in
diff --git a/srp_daemon/srp_daemon/srp_daemon.c → srp_daemon/srp_daemon.c b/srp_daemon/srp_daemon/srp_daemon.c → srp_daemon/srp_daemon.c
diff --git a/srp_daemon/srp_daemon/srp_daemon.conf → srp_daemon/srp_daemon.conf b/srp_daemon/srp_daemon/srp_daemon.conf → srp_daemon/srp_daemon.conf
diff --git a/srp_daemon/srp_daemon/srp_daemon.h → srp_daemon/srp_daemon.h b/srp_daemon/srp_daemon/srp_daemon.h → srp_daemon/srp_daemon.h
diff --git a/srp_daemon/srp_daemon/srp_daemon.sh.in → srp_daemon/srp_daemon.sh.in b/srp_daemon/srp_daemon/srp_daemon.sh.in → srp_daemon/srp_daemon.sh.in
diff --git a/srp_daemon/srp_daemon/srp_handle_traps.c → srp_daemon/srp_handle_traps.c b/srp_daemon/srp_daemon/srp_handle_traps.c → srp_daemon/srp_handle_traps.c
diff --git a/srp_daemon/srp_daemon/srp_ib_types.h → srp_daemon/srp_ib_types.h b/srp_daemon/srp_daemon/srp_ib_types.h → srp_daemon/srp_ib_types.h
diff --git a/srp_daemon/srp_daemon/srp_sync.c → srp_daemon/srp_sync.c b/srp_daemon/srp_daemon/srp_sync.c → srp_daemon/srp_sync.c
diff --git a/srp_daemon/srp_daemon/srpd.in → srp_daemon/srpd.in b/srp_daemon/srp_daemon/srpd.in → srp_daemon/srpd.in