build: move manual page next to the source code

In the future, this will allow to generate part of the manual page.

diff --git a/Makefile.am b/Makefile.am
index d9f6df61708b4b225cd4ecd49e72b90facce8e9f..2bc008a8495a1b45f7fc1a5044634803a7e9b2b4 100644 (file)
--- 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 1749ee8e72385b49dbb73ce1696134149748a0ef..2ffe16c8a87fa2e53300ed0abc48a24a74ab7ea9 100644 (file)
--- 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 (file)
index 30908af..0000000
--- 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 896dccd0fac786605a4b25c6c3a629c08d9ba65a..2b0576ed09dd0ce42d950323ad7796a772865476 100644 (file)
--- 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 a834d4d00d3e2616348d07caa9dac3a4edb65f76..75b44cf27931d7a104c53f23ce3a4af53b696ac2 100644 (file)
--- 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