build: merge "docs/Makefile.am" into toplevel Makefile

2024-10-01 13:55:36 +00:00 · 2016-10-18 15:53:05 +02:00 · 2016-10-18 15:53:05 +02:00 · b0f4e25782
parent 03e88d92a6
commit b0f4e25782
3 changed files with 10 additions and 9 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -77,7 +77,16 @@ SUBDIRS = \
 	. \
 	po \
 	examples \
-	docs \
+	docs/libnm \
+	docs/api
+
+if WITH_LEGACY_LIBRARIES
+SUBDIRS += \
+	docs/libnm-util \
+	docs/libnm-glib
+endif
+
+SUBDIRS += \
 	vapi

 ###############################################################################
--- a/configure.ac
+++ b/configure.ac
@ -1141,7 +1141,6 @@ libnm-glib/libnm-glib-vpn.pc
 man/common.ent
 po/Makefile.in
 policy/org.freedesktop.NetworkManager.policy.in
-docs/Makefile
 docs/api/Makefile
 docs/api/version.xml
 docs/libnm-glib/Makefile
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@ -1,7 +0,0 @@
-SUBDIRS = libnm api
-
-if WITH_LEGACY_LIBRARIES
-SUBDIRS += \
-	libnm-util \
-	libnm-glib
-endif