[nozzle] move man pages to top level dir

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/configure.ac b/configure.ac
index 686157e70ceb32dfa88ae7e30e73c57c2ac7c63d..86faa74340ff38bc6f505bd608083533f4f47e11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -501,8 +501,6 @@ AC_CONFIG_FILES([
                libnozzle/Makefile
                libnozzle/libnozzle.pc
                libnozzle/tests/Makefile
-               libnozzle/man/Doxyfile
-               libnozzle/man/Makefile
                kronosnetd/Makefile
                kronosnetd/kronosnetd.logrotate
                libknet/Makefile
@@ -510,6 +508,7 @@ AC_CONFIG_FILES([
                libknet/tests/Makefile
                man/Makefile
                man/Doxyfile-knet
+               man/Doxyfile-nozzle
                poc-code/Makefile
                poc-code/iov-hash/Makefile
                poc-code/access-list/Makefile

diff --git a/libnozzle/Makefile.am b/libnozzle/Makefile.am
index 57e970656078da3b4500e45418e1bc8aa4bd1945..4982d94b8cce4278bd3fb05760803bc2aa98db8e 100644 (file)
--- a/libnozzle/Makefile.am
+++ b/libnozzle/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST            = $(SYMFILE)
 
 if BUILD_LIBNOZZLE
 
-SUBDIRS                        = . tests man
+SUBDIRS                        = . tests
 
 libversion             = 1:0:0
 
@@ -46,6 +46,4 @@ libnozzle_la_LDFLAGS  = $(AM_LDFLAGS) \
 
 libnozzle_la_LIBADD    = $(PTHREAD_LIBS)
 
-dist_man_MANS          = man
-
 endif

diff --git a/libnozzle/man/Doxyfile.in b/libnozzle/man/Doxyfile.in
deleted file mode 100644 (file)
index 78b1f9b..0000000
--- a/libnozzle/man/Doxyfile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2017 Red Hat, Inc.  All rights reserved.
-#
-# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
-#         Christine Caulfield <ccaulfie@redhat.com>
-#
-# This software licensed under GPL-2.0+, LGPL-2.0+
-#
-PROJECT_NAME          = @PACKAGE_NAME@
-PROJECT_NUMBER         = @PACKAGE_VERSION@
-INPUT                  = @srcdir@/../libnozzle.h
-XML_OUTPUT             = @abs_builddir@/xml
-GENERATE_XML           = YES
-XML_PROGRAMLISTING     = NO
-AUTOLINK_SUPPORT       = NO
-GENERATE_HTML          = NO
-GENERATE_LATEX         = NO

diff --git a/libnozzle/man/Makefile.am b/libnozzle/man/Makefile.am
deleted file mode 100644 (file)
index b41863a..0000000
--- a/libnozzle/man/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2017 Red Hat, Inc.  All rights reserved.
-#
-# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
-#
-# This software licensed under GPL-2.0+, LGPL-2.0+
-#
-
-MAINTAINERCLEANFILES   = Makefile.in
-
-include $(top_srcdir)/build-aux/check.mk
-
-dist_man_MANS =
-
-$(MANS): doxyfile.stamp
-
-$(top_builddir)/build-aux/doxyxml: $(top_srcdir)/build-aux/doxyxml.c
-       $(MAKE) -C $(top_builddir)/build-aux doxyxml
-
-doxyfile.stamp: Doxyfile $(top_srcdir)/libnozzle/libnozzle.h $(top_builddir)/build-aux/doxyxml $(top_srcdir)/build-aux/doxyxml.c
-       $(DOXYGEN) Doxyfile
-       $(top_builddir)/build-aux/doxyxml -m -P -o $(builddir) -s 3 -p @PACKAGE_NAME@ -H "Kronosnet Programmer's Manual" -d $(builddir)/xml/ libnozzle_8h.xml
-       touch doxyfile.stamp
-
-clean-local:
-       rm -rf doxyfile.stamp xml *.3

diff --git a/man/Doxyfile-nozzle.in b/man/Doxyfile-nozzle.in
new file mode 100644 (file)
index 0000000..3695ee4
--- /dev/null
+++ b/man/Doxyfile-nozzle.in
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2017 Red Hat, Inc.  All rights reserved.
+#
+# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
+#         Christine Caulfield <ccaulfie@redhat.com>
+#
+# This software licensed under GPL-2.0+, LGPL-2.0+
+#
+PROJECT_NAME          = @PACKAGE_NAME@
+PROJECT_NUMBER         = @PACKAGE_VERSION@
+INPUT                  = @abs_top_srcdir@/libnozzle/libnozzle.h
+XML_OUTPUT             = @abs_builddir@/xml-nozzle
+GENERATE_XML           = YES
+XML_PROGRAMLISTING     = NO
+AUTOLINK_SUPPORT       = NO
+GENERATE_HTML          = NO
+GENERATE_LATEX         = NO

diff --git a/man/Makefile.am b/man/Makefile.am
index 9f2741b17a681e71ceaf52078bc4b89219fa1cb4..29cd45e7c47dc7018bde52c63cd53ac41789c3d3 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -95,9 +95,13 @@ knet_man3_MANS = \
                knet_send_sync.3 \
                knet_strtoaddr.3
 
-man3_MANS = $(knet_man3_MANS)
+if BUILD_LIBNOZZLE
+nozzle_man3_MANS =
+endif
+
+man3_MANS = $(knet_man3_MANS) $(nozzle_man3_MANS)
 
-$(MANS): doxyfile-knet.stamp
+$(MANS): doxyfile-knet.stamp doxyfile-nozzle.stamp
 
 doxyfile-knet.stamp: $(builddir)/doxyxml Doxyfile-knet $(top_srcdir)/libknet/libknet.h
        $(DOXYGEN) Doxyfile-knet
@@ -105,6 +109,13 @@ doxyfile-knet.stamp: $(builddir)/doxyxml Doxyfile-knet $(top_srcdir)/libknet/lib
                $$($(UTC_DATE_AT)$(SOURCE_EPOCH) +"-D %F -Y %Y") -d $(builddir)/xml-knet/ libknet_8h.xml
        touch doxyfile-knet.stamp
 
+doxyfile-nozzle.stamp: $(builddir)/doxyxml Doxyfile-nozzle $(top_srcdir)/libnozzle/libnozzle.h
+if BUILD_LIBNOZZLE
+       $(DOXYGEN) Doxyfile-nozzle
+       $(builddir)/doxyxml -m -P -o $(builddir) -s 3 -p @PACKAGE_NAME@ -H "Kronosnet Programmer's Manual" -d $(builddir)/xml-nozzle/ libnozzle_8h.xml
+endif
+       touch doxyfile-nozzle.stamp
+
 endif
 
 clean-local: