Skip to content

Commit

Permalink
[nozzle] move man pages to top level dir
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
  • Loading branch information
fabbione committed Apr 19, 2018
1 parent 68ad91c commit 67f2a66
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 35 deletions.
3 changes: 1 addition & 2 deletions configure.ac
Expand Up @@ -498,15 +498,14 @@ AC_CONFIG_FILES([
libnozzle/Makefile
libnozzle/libnozzle.pc
libnozzle/tests/Makefile
libnozzle/man/Doxyfile
libnozzle/man/Makefile
kronosnetd/Makefile
kronosnetd/kronosnetd.logrotate
libknet/Makefile
libknet/libknet.pc
libknet/tests/Makefile
man/Makefile
man/Doxyfile-knet
man/Doxyfile-nozzle
poc-code/Makefile
poc-code/iov-hash/Makefile
poc-code/access-list/Makefile
Expand Down
4 changes: 1 addition & 3 deletions libnozzle/Makefile.am
Expand Up @@ -16,7 +16,7 @@ EXTRA_DIST = $(SYMFILE)

if BUILD_LIBNOZZLE

SUBDIRS = . tests man
SUBDIRS = . tests

libversion = 1:0:0

Expand Down Expand Up @@ -46,6 +46,4 @@ libnozzle_la_LDFLAGS = $(AM_LDFLAGS) \

libnozzle_la_LIBADD = $(PTHREAD_LIBS)

dist_man_MANS = man

endif
26 changes: 0 additions & 26 deletions libnozzle/man/Makefile.am

This file was deleted.

4 changes: 2 additions & 2 deletions libnozzle/man/Doxyfile.in → man/Doxyfile-nozzle.in
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions man/Makefile.am
Expand Up @@ -95,16 +95,27 @@ 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
$(builddir)/doxyxml -m -P -o $(builddir) -s 3 -p @PACKAGE_NAME@ -H "Kronosnet Programmer's Manual" \
$$($(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:
Expand Down

0 comments on commit 67f2a66

Please sign in to comment.