Page MenuHomeClusterLabs Projects
Files F3153265

No OneTemporary
Actions

View Options

diff --git a/kronosnetd/Makefile.am b/kronosnetd/Makefile.am
index 1e6458d0..8c233579 100644
--- a/kronosnetd/Makefile.am
+++ b/kronosnetd/Makefile.am
@@ -1,91 +1,89 @@
#
# Copyright (C) 2012-2018 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in kronostnetd.logrotate
include $(top_srcdir)/build-aux/check.mk
-EXTRA_DIST = kronosnetd.logrotate.in kronosnetd.8 knet-keygen.8
+EXTRA_DIST = kronosnetd.logrotate.in
noinst_HEADERS = \
cfg.h \
etherfilter.h \
logging.h \
vty.h \
vty_auth.h \
vty_cli.h \
vty_cli_cmds.h \
vty_utils.h
kronosnetd_SOURCES = \
cfg.c \
etherfilter.c \
main.c \
logging.c \
vty.c \
vty_auth.c \
vty_cli.c \
vty_cli_cmds.c \
vty_utils.c
kronosnetd_CPPFLAGS = \
-I$(top_srcdir)/libtap \
-I$(top_srcdir)/libknet
kronosnetd_CFLAGS = $(AM_CFLAGS) $(libqb_CFLAGS)
kronosnetd_LDADD = \
$(top_builddir)/libknet/libknet.la \
$(top_builddir)/libtap/libtap.la \
$(libqb_LIBS) \
$(pam_misc_LIBS) $(pam_LIBS)
knet_keygen_SOURCES = keygen.c
knet_keygen_CPPFLAGS = -I$(top_srcdir)/libknet
if BUILD_KRONOSNETD
sbin_PROGRAMS = kronosnetd \
knet-keygen
-dist_man_MANS = kronosnetd.8 knet-keygen.8
-
install-exec-local:
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d
$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/logrotate.d
$(INSTALL) -m 644 kronosnetd.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/pam.d
if [ -a $(sysconfdir)/pam.d/password-auth ]; then \
cd $(DESTDIR)/$(sysconfdir)/pam.d && \
rm -f kronosnetd && \
$(LN_S) password-auth kronosnetd; \
else \
cd $(DESTDIR)/$(sysconfdir)/pam.d && \
rm -f kronosnetd && \
$(LN_S) passwd kronosnetd; \
fi
uninstall-local:
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR) || :;
rm -f $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
rmdir $(DESTDIR)/$(sysconfdir)/logrotate.d || :;
rm -f $(DESTDIR)/$(sysconfdir)/pam.d/kronosnetd || :;
rmdir $(DESTDIR)/$(sysconfdir)/pam.d || :;
endif
diff --git a/man/Makefile.am b/man/Makefile.am
index e0c8a3a3..72c07f89 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,103 +1,109 @@
#
# Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
#
# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
# Federico Simoncelli <fsimon@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build-aux/check.mk
+EXTRA_DIST = kronosnetd.8 knet-keygen.8
+
# Avoid Automake warnings about overriding these user variables.
# Programs in this directory are used during the build only.
AUTOMAKE_OPTIONS = -Wno-gnu
EXEEXT=$(BUILD_EXEEXT)
CC=$(CC_FOR_BUILD)
CFLAGS=$(CFLAGS_FOR_BUILD)
CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
LDFLAGS=$(LDFLAGS_FOR_BUILD)
if BUILD_MAN
+if BUILD_KRONOSNETD
+man8_MANS = kronosnetd.8 knet-keygen.8
+endif
+
noinst_PROGRAMS = doxyxml
doxyxml_SOURCES = doxyxml.c
doxyxml_CFLAGS = $(AM_CFLAGS) $(libqb_BUILD_CFLAGS) $(libxml_BUILD_CFLAGS)
doxyxml_LDADD = $(libqb_BUILD_LIBS) $(libxml_BUILD_LIBS)
knet_man3_MANS = \
knet_addrtostr.3 \
knet_handle_add_datafd.3 \
knet_handle_clear_stats.3 \
knet_handle_compress.3 \
knet_handle_crypto.3 \
knet_handle_enable_filter.3 \
knet_handle_enable_pmtud_notify.3 \
knet_handle_enable_sock_notify.3 \
knet_handle_free.3 \
knet_handle_get_channel.3 \
knet_get_compress_list.3 \
knet_get_crypto_list.3 \
knet_handle_get_datafd.3 \
knet_handle_get_stats.3 \
knet_get_transport_id_by_name.3 \
knet_get_transport_list.3 \
knet_get_transport_name_by_id.3 \
knet_handle_get_transport_reconnect_interval.3 \
knet_handle_new.3 \
knet_handle_pmtud_get.3 \
knet_handle_pmtud_getfreq.3 \
knet_handle_pmtud_setfreq.3 \
knet_handle_remove_datafd.3 \
knet_handle_setfwd.3 \
knet_handle_set_transport_reconnect_interval.3 \
knet_host_add.3 \
knet_host_enable_status_change_notify.3 \
knet_host_get_host_list.3 \
knet_host_get_id_by_host_name.3 \
knet_host_get_name_by_host_id.3 \
knet_host_get_policy.3 \
knet_host_get_status.3 \
knet_host_remove.3 \
knet_host_set_name.3 \
knet_host_set_policy.3 \
knet_link_clear_config.3 \
knet_link_get_config.3 \
knet_link_get_enable.3 \
knet_link_get_link_list.3 \
knet_link_get_ping_timers.3 \
knet_link_get_pong_count.3 \
knet_link_get_priority.3 \
knet_link_get_status.3 \
knet_link_set_config.3 \
knet_link_set_enable.3 \
knet_link_set_ping_timers.3 \
knet_link_set_pong_count.3 \
knet_link_set_priority.3 \
knet_log_get_loglevel.3 \
knet_log_get_loglevel_id.3 \
knet_log_get_loglevel_name.3 \
knet_log_get_subsystem_id.3 \
knet_log_get_subsystem_name.3 \
knet_log_set_loglevel.3 \
knet_recv.3 \
knet_send.3 \
knet_send_sync.3 \
knet_strtoaddr.3
man3_MANS = $(knet_man3_MANS)
$(MANS): doxyfile-knet.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" -d $(builddir)/xml-knet/ libknet_8h.xml
touch doxyfile.stamp
endif
clean-local:
rm -rf doxyfile*.stamp xml* *.3
diff --git a/kronosnetd/knet-keygen.8 b/man/knet-keygen.8
similarity index 100%
rename from kronosnetd/knet-keygen.8
rename to man/knet-keygen.8
diff --git a/kronosnetd/kronosnetd.8 b/man/kronosnetd.8
similarity index 100%
rename from kronosnetd/kronosnetd.8
rename to man/kronosnetd.8

File Metadata

Mime Type
text/x-diff
Expires
Tue, Feb 25, 3:03 PM (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1464872
Default Alt Text
(6 KB)

Event Timeline