qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-dispatch git commit: NO-JIRA: allow "make docs" as well as "make doc" to build documentation.
Date Fri, 15 Jan 2016 21:03:13 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master e8b516ba9 -> 0d9a1496c


NO-JIRA: allow "make docs" as well as "make doc" to build documentation.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0d9a1496
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0d9a1496
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0d9a1496

Branch: refs/heads/master
Commit: 0d9a1496cf7f3353744e596c21056651893659c2
Parents: e8b516b
Author: Alan Conway <aconway@redhat.com>
Authored: Fri Jan 15 16:02:51 2016 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Fri Jan 15 16:02:51 2016 -0500

----------------------------------------------------------------------
 doc/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0d9a1496/doc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e28ea75..9b683d9 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -35,6 +35,7 @@ if(BUILD_DOCS)
   else()
     set (OPTIONAL OPTIONAL)
     add_custom_target(doc)
+    add_custom_target(docs DEPENDS doc) # some projects say "make doc" others "make docs"
allow both.
   endif()
   macro(install_doc)
     install(${ARGN} ${OPTIONAL})
@@ -137,7 +138,7 @@ if(BUILD_DOCS)
       COMMAND ${SPHINX_BUILD} -d ${bin}/doctrees -b html ${bin} ${bin}/dochtml
       # man/ contains Unix man pages.
       COMMAND ${SPHINX_BUILD} -d ${bin}/doctrees -b man  ${bin} ${bin}/man
-      DEPENDS ${RST_SRC} ${HELP_GEN} ${SCHEMA_GEN} 
+      DEPENDS ${RST_SRC} ${HELP_GEN} ${SCHEMA_GEN}
       )
     add_custom_target(doc-sphinx DEPENDS ${SPHINX_OUTPUT})
     add_dependencies(doc doc-sphinx)
@@ -150,5 +151,3 @@ if(BUILD_DOCS)
 
 
 endif(BUILD_DOCS)
-
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message