From a5cf540cbcf773bcf23caf43a18fefa55ae994f8 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 4 Sep 2012 21:10:49 +0200 Subject: [PATCH] build: move manual page next to the source code In the future, this will allow to generate part of the manual page. --- Makefile.am | 2 +- configure.ac | 2 +- man/Makefile.am | 2 -- src/client/Makefile.am | 1 + {man => src/client}/lldpctl.8 | 0 src/daemon/Makefile.am | 1 + {man => src/daemon}/lldpd.8 | 0 7 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 man/Makefile.am rename {man => src/client}/lldpctl.8 (100%) rename {man => src/daemon}/lldpd.8 (100%) diff --git a/Makefile.am b/Makefile.am index d9f6df61..2bc008a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include doxygen.am ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src/compat src src/daemon src/lib src/client man tests +SUBDIRS = src/compat src src/daemon src/lib src/client tests EXTRA_DIST = $(DX_CONFIG) DIST_SUBDIRS = $(SUBDIRS) libevent diff --git a/configure.ac b/configure.ac index 1749ee8e..2ffe16c8 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CONFIG_SRCDIR([src/log.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile src/Makefile src/compat/Makefile src/daemon/Makefile src/lib/Makefile src/lib/lldpctl.pc src/client/Makefile - man/Makefile tests/Makefile]) + tests/Makefile]) AC_CONFIG_MACRO_DIR([m4]) # Configure automake diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 30908afb..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -man_MANS = lldpd.8 lldpctl.8 -EXTRA_DIST = $(man_MANS) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 896dccd0..2b0576ed 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,4 +1,5 @@ sbin_PROGRAMS = lldpctl +dist_man_MANS = lldpctl.8 lldpctl_SOURCES = client.h lldpctl.c display.c writer.h text_writer.c kv_writer.c actions.c lldpctl_LDADD = $(top_builddir)/src/libcommon-daemon-client.la $(top_builddir)/src/lib/liblldpctl.la diff --git a/man/lldpctl.8 b/src/client/lldpctl.8 similarity index 100% rename from man/lldpctl.8 rename to src/client/lldpctl.8 diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index a834d4d0..75b44cf2 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,4 +1,5 @@ sbin_PROGRAMS = lldpd +dist_man_MANS = lldpd.8 noinst_LTLIBRARIES = liblldpd.la diff --git a/man/lldpd.8 b/src/daemon/lldpd.8 similarity index 100% rename from man/lldpd.8 rename to src/daemon/lldpd.8 -- 2.39.5