From 6e3e091cd08b03eb7d221dc67ee8594864e77a35 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Mon, 19 Feb 2018 14:34:04 +0100
Subject: [PATCH] [nozzle] move man pages to top level dir

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure.ac                                  |  3 +--
 libnozzle/Makefile.am                         |  4 +--
 libnozzle/man/Makefile.am                     | 26 -------------------
 .../man/Doxyfile.in => man/Doxyfile-nozzle.in |  4 +--
 man/Makefile.am                               | 15 +++++++++--
 5 files changed, 17 insertions(+), 35 deletions(-)
 delete mode 100644 libnozzle/man/Makefile.am
 rename libnozzle/man/Doxyfile.in => man/Doxyfile-nozzle.in (79%)

diff --git a/configure.ac b/configure.ac
index 686157e..86faa74 100644
--- 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 57e9706..4982d94 100644
--- 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/Makefile.am b/libnozzle/man/Makefile.am
deleted file mode 100644
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/libnozzle/man/Doxyfile.in b/man/Doxyfile-nozzle.in
similarity index 79%
rename from libnozzle/man/Doxyfile.in
rename to man/Doxyfile-nozzle.in
index 78b1f9b..3695ee4 100644
--- a/libnozzle/man/Doxyfile.in
+++ b/man/Doxyfile-nozzle.in
@@ -8,8 +8,8 @@
 #
 PROJECT_NAME	       = @PACKAGE_NAME@
 PROJECT_NUMBER         = @PACKAGE_VERSION@
-INPUT                  = @srcdir@/../libnozzle.h
-XML_OUTPUT             = @abs_builddir@/xml
+INPUT                  = @abs_top_srcdir@/libnozzle/libnozzle.h
+XML_OUTPUT             = @abs_builddir@/xml-nozzle
 GENERATE_XML           = YES
 XML_PROGRAMLISTING     = NO
 AUTOLINK_SUPPORT       = NO
diff --git a/man/Makefile.am b/man/Makefile.am
index 9f2741b..29cd45e 100644
--- 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:
-- 
2.39.5