Fixed pki-tools build order.

To help troubleshooting build issues the pki-tools build targets
have been modified such that they run sequentially. This way error
messages will be easier to find in the build log.

https://fedorahosted.org/pki/ticket/2463

7 files changed, 7 insertions, 7 deletions

diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index 8fd44f3f9..c2f54d41b 100644
--- a/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
@@ -102,7 +102,7 @@ javac(pki-tools-classes
     OUTPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
     DEPENDS
-        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
+        pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar tkstool
 )
 
 configure_file(
diff --git a/base/native-tools/src/p7tool/CMakeLists.txt b/base/native-tools/src/p7tool/CMakeLists.txt
index 6adfbedb7..cff358723 100644
--- a/base/native-tools/src/p7tool/CMakeLists.txt
+++ b/base/native-tools/src/p7tool/CMakeLists.txt
@@ -22,7 +22,7 @@ set(p7tool_SRCS
 include_directories(${P7TOOL_PRIVATE_INCLUDE_DIRS})
 
 add_executable(p7tool ${p7tool_SRCS})
-
+add_dependencies(p7tool pki-certsrv-jar)
 target_link_libraries(p7tool ${P7TOOL_LINK_LIBRARIES})
 
 install(
diff --git a/base/native-tools/src/revoker/CMakeLists.txt b/base/native-tools/src/revoker/CMakeLists.txt
index 5aa5ddff3..c70b5d746 100644
--- a/base/native-tools/src/revoker/CMakeLists.txt
+++ b/base/native-tools/src/revoker/CMakeLists.txt
@@ -19,7 +19,7 @@ set(revoker_SRCS
 include_directories(${REVOKER_PRIVATE_INCLUDE_DIRS})
 
 add_executable(revoker ${revoker_SRCS})
-
+add_dependencies(revoker p7tool)
 target_link_libraries(revoker ${REVOKER_LINK_LIBRARIES})
 
 install(
diff --git a/base/native-tools/src/setpin/CMakeLists.txt b/base/native-tools/src/setpin/CMakeLists.txt
index b32e12b22..b45f081ef 100644
--- a/base/native-tools/src/setpin/CMakeLists.txt
+++ b/base/native-tools/src/setpin/CMakeLists.txt
@@ -25,7 +25,7 @@ set(setpin_SRCS
 include_directories(${SETPIN_PRIVATE_INCLUDE_DIRS})
 
 add_executable(setpin ${setpin_SRCS})
-
+add_dependencies(setpin revoker)
 target_link_libraries(setpin ${SETPIN_LINK_LIBRARIES})
 
 install(
diff --git a/base/native-tools/src/sslget/CMakeLists.txt b/base/native-tools/src/sslget/CMakeLists.txt
index ec4bd85f9..91d953fb6 100644
--- a/base/native-tools/src/sslget/CMakeLists.txt
+++ b/base/native-tools/src/sslget/CMakeLists.txt
@@ -19,7 +19,7 @@ set(sslget_SRCS
 include_directories(${SSLGET_PRIVATE_INCLUDE_DIRS})
 
 add_executable(sslget ${sslget_SRCS})
-
+add_dependencies(sslget setpin)
 target_link_libraries(sslget ${SSLGET_LINK_LIBRARIES})
 
 install(
diff --git a/base/native-tools/src/tkstool/CMakeLists.txt b/base/native-tools/src/tkstool/CMakeLists.txt
index 8c6571788..66eee6640 100644
--- a/base/native-tools/src/tkstool/CMakeLists.txt
+++ b/base/native-tools/src/tkstool/CMakeLists.txt
@@ -34,7 +34,7 @@ set(tkstool_SRCS
 include_directories(${TKSTOOL_PRIVATE_INCLUDE_DIRS})
 
 add_executable(tkstool ${tkstool_SRCS})
-add_dependencies(tkstool pki-certsrv-jar)
+add_dependencies(tkstool sslget)
 target_link_libraries(tkstool ${TKSTOOL_LINK_LIBRARIES})
 
 install(
diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt
index 7595f47ee..6bdc7c388 100644
--- a/base/server/tomcat/src/CMakeLists.txt
+++ b/base/server/tomcat/src/CMakeLists.txt
@@ -136,5 +136,5 @@ javac(pki-tomcat-classes
     OUTPUT_DIR
         ${CMAKE_BINARY_DIR}/../../tomcat
     DEPENDS
-        pki-certsrv-jar
+        pki-tools-jar
 )