build: merge man/Makefile.am into top-level makefile

diff --git a/Makefile.am b/Makefile.am
index 278d1071ff60c940a5ec1cfbba9d16bf2f5a3f62..8dd245d52716ae0df64911d5fe61e2a2018e6d82 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
        . \
-       man \
        python \
        tests
 
@@ -529,6 +528,16 @@ endif
 
 ###############################################################################
 
+dist_man8_MANS = \
+       man/nl-classid-lookup.8 \
+       man/nl-pktloc-lookup.8 \
+       man/nl-qdisc-add.8 \
+       man/nl-qdisc-delete.8 \
+       man/nl-qdisc-list.8 \
+       man/genl-ctrl-list.8
+
+###############################################################################
+
 if ENABLE_CLI
 pkgconfig_DATA += libnl-cli-3.0.pc
 endif

diff --git a/configure.ac b/configure.ac
index 9b6b8b52a4a708598a9f00b047993afa2251165d..04a64d339016bad16ec19a801b3903543738a66f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,6 @@ libnl-idiag-3.0.pc
 src/Makefile
 src/lib/Makefile
 tests/Makefile
-man/Makefile
 python/Makefile
 python/setup.py
 python/doc/Makefile

diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644 (file)
index af1277b..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Makefile -*-
-
-dist_man8_MANS = \
-       nl-classid-lookup.8 \
-       nl-pktloc-lookup.8 \
-       nl-qdisc-add.8 nl-qdisc-delete.8 nl-qdisc-list.8 \
-       genl-ctrl-list.8