diff --git a/configure.ac b/configure.ac index e4357cc7c..ca97701e5 100644 --- a/configure.ac +++ b/configure.ac @@ -450,6 +450,9 @@ AC_CONFIG_FILES([ init/Makefile libnozzle/Makefile libnozzle/libnozzle.pc + libnozzle/tests/Makefile + libnozzle/man/Doxyfile + libnozzle/man/Makefile kronosnetd/Makefile kronosnetd/kronosnetd.logrotate libknet/Makefile diff --git a/libnozzle/Makefile.am b/libnozzle/Makefile.am index b79037455..c208f58f6 100644 --- a/libnozzle/Makefile.am +++ b/libnozzle/Makefile.am @@ -10,16 +10,17 @@ MAINTAINERCLEANFILES = Makefile.in include $(top_srcdir)/build-aux/check.mk - SYMFILE = libnozzle_exported_syms -EXTRA_DIST = $(SYMFILE) tap_updown_bad tap_updown_good api-test-coverage +EXTRA_DIST = $(SYMFILE) -sources = libnozzle.c +if BUILD_LIBNOZZLE + +SUBDIRS = . tests man libversion = 1:0:0 -if BUILD_LIBNOZZLE +sources = libnozzle.c include_HEADERS = libnozzle.h @@ -44,25 +45,6 @@ libnozzle_la_LDFLAGS = $(AM_LDFLAGS) \ libnozzle_la_LIBADD = $(PTHREAD_LIBS) -check_PROGRAMS = nozzle_test - -TESTS = $(check_PROGRAMS) - -noinst_PROGRAMS = $(check_PROGRAMS) - -check-local: check-api-test-coverage - -check-api-test-coverage: - chmod u+x $(top_srcdir)/libnozzle/api-test-coverage - $(top_srcdir)/libnozzle/api-test-coverage $(top_srcdir) $(top_builddir) - -nozzle_test_SOURCES = $(sources) - -nozzle_test_CPPFLAGS = -DTEST \ - -DABSBUILDDIR=\"$(abs_builddir)\" - -nozzle_test_CFLAGS = $(PTHREAD_CFLAGS) - -nozzle_test_LDFLAGS = $(PTHREAD_LIBS) +dist_man_MANS = man endif diff --git a/libnozzle/man/Doxyfile.in b/libnozzle/man/Doxyfile.in new file mode 100644 index 000000000..78b1f9b23 --- /dev/null +++ b/libnozzle/man/Doxyfile.in @@ -0,0 +1,17 @@ +# +# Copyright (C) 2017 Red Hat, Inc. All rights reserved. +# +# Author: Fabio M. Di Nitto +# Christine Caulfield +# +# 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 new file mode 100644 index 000000000..49381eef6 --- /dev/null +++ b/libnozzle/man/Makefile.am @@ -0,0 +1,27 @@ +# +# Copyright (C) 2017 Red Hat, Inc. All rights reserved. +# +# Authors: Fabio M. Di Nitto +# +# This software licensed under GPL-2.0+, LGPL-2.0+ +# + +MAINTAINERCLEANFILES = Makefile.in + +include $(top_srcdir)/build-aux/check.mk + +dist_man_MANS = + +update-man-pages: doxyfile.stamp + +doxyfile.stamp: Doxyfile +if MANPAGEUPDATES + $(DOXYGEN) Doxyfile + $(DOXY2MAN) -o $(abs_srcdir) -s 3 --short-pkg @PACKAGE_NAME@ --pkg "Kronosnet Programmer's Manual" $(builddir)/xml/libnozzle_8h.xml +else + @echo this system does not have doxy2man or doxygen installed. Unable to update man pages automatically. +endif + touch doxyfile.stamp + +clean-local: + rm -rf doxyfile.stamp xml diff --git a/libnozzle/tests/Makefile.am b/libnozzle/tests/Makefile.am new file mode 100644 index 000000000..73cd8ccc3 --- /dev/null +++ b/libnozzle/tests/Makefile.am @@ -0,0 +1,38 @@ +# +# Copyright (C) 2010-2017 Red Hat, Inc. All rights reserved. +# +# Author: Fabio M. Di Nitto +# +# This software licensed under GPL-2.0+, LGPL-2.0+ +# + +MAINTAINERCLEANFILES = Makefile.in + +include $(top_srcdir)/build-aux/check.mk + +EXTRA_DIST = tap_updown_bad tap_updown_good api-test-coverage + +if BUILD_LIBNOZZLE + +check_PROGRAMS = nozzle_test + +TESTS = $(check_PROGRAMS) + +noinst_PROGRAMS = $(check_PROGRAMS) + +check-local: check-api-test-coverage + +check-api-test-coverage: + chmod u+x $(top_srcdir)/libnozzle/api-test-coverage + $(top_srcdir)/libnozzle/api-test-coverage $(top_srcdir) $(top_builddir) + +nozzle_test_SOURCES = ../libnozzle.c + +nozzle_test_CPPFLAGS = -DTEST \ + -DABSBUILDDIR=\"$(abs_builddir)\" + +nozzle_test_CFLAGS = $(PTHREAD_CFLAGS) + +nozzle_test_LDFLAGS = $(PTHREAD_LIBS) + +endif diff --git a/libnozzle/api-test-coverage b/libnozzle/tests/api-test-coverage similarity index 100% rename from libnozzle/api-test-coverage rename to libnozzle/tests/api-test-coverage diff --git a/libnozzle/tap_updown_bad/down.d/kronostest b/libnozzle/tests/tap_updown_bad/down.d/kronostest similarity index 100% rename from libnozzle/tap_updown_bad/down.d/kronostest rename to libnozzle/tests/tap_updown_bad/down.d/kronostest diff --git a/libnozzle/tap_updown_bad/post-down.d/kronostest b/libnozzle/tests/tap_updown_bad/post-down.d/kronostest similarity index 100% rename from libnozzle/tap_updown_bad/post-down.d/kronostest rename to libnozzle/tests/tap_updown_bad/post-down.d/kronostest diff --git a/libnozzle/tap_updown_bad/pre-up.d/kronostest b/libnozzle/tests/tap_updown_bad/pre-up.d/kronostest similarity index 100% rename from libnozzle/tap_updown_bad/pre-up.d/kronostest rename to libnozzle/tests/tap_updown_bad/pre-up.d/kronostest diff --git a/libnozzle/tap_updown_bad/up.d/kronostest b/libnozzle/tests/tap_updown_bad/up.d/kronostest similarity index 100% rename from libnozzle/tap_updown_bad/up.d/kronostest rename to libnozzle/tests/tap_updown_bad/up.d/kronostest diff --git a/libnozzle/tap_updown_good/down.d/kronostest b/libnozzle/tests/tap_updown_good/down.d/kronostest similarity index 100% rename from libnozzle/tap_updown_good/down.d/kronostest rename to libnozzle/tests/tap_updown_good/down.d/kronostest diff --git a/libnozzle/tap_updown_good/post-down.d/kronostest b/libnozzle/tests/tap_updown_good/post-down.d/kronostest similarity index 100% rename from libnozzle/tap_updown_good/post-down.d/kronostest rename to libnozzle/tests/tap_updown_good/post-down.d/kronostest diff --git a/libnozzle/tap_updown_good/pre-up.d/kronostest b/libnozzle/tests/tap_updown_good/pre-up.d/kronostest similarity index 100% rename from libnozzle/tap_updown_good/pre-up.d/kronostest rename to libnozzle/tests/tap_updown_good/pre-up.d/kronostest diff --git a/libnozzle/tap_updown_good/up.d/kronostest b/libnozzle/tests/tap_updown_good/up.d/kronostest similarity index 100% rename from libnozzle/tap_updown_good/up.d/kronostest rename to libnozzle/tests/tap_updown_good/up.d/kronostest