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

9 files changed, 39 insertions, 60 deletions

diff --git a/Makefile.am b/Makefile.am
index 8dd245d..8e7e621 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
 	. \
-	python \
 	tests
 
 if ENABLE_CLI
@@ -538,6 +537,45 @@ dist_man8_MANS = \
 
 ###############################################################################
 
+EXTRA_DIST += \
+	python/README \
+	\
+	python/doc/conf.py \
+	python/doc/core.rst \
+	python/doc/index.rst \
+	python/doc/route_addr.rst \
+	python/doc/route.rst \
+	\
+	python/examples/iface.py \
+	python/examples/nl80211.py \
+	python/examples/wiphy.py \
+	\
+	python/netlink/capi.i \
+	python/netlink/fixes.h \
+	python/netlink/__init__.py \
+	python/netlink/core.py \
+	python/netlink/util.py \
+	python/netlink/utils.h \
+	\
+	python/netlink/genl/capi.i \
+	python/netlink/genl/__init__.py \
+	\
+	python/netlink/route/capi.i \
+	python/netlink/route/__init__.py \
+	python/netlink/route/address.py \
+	python/netlink/route/link.py \
+	python/netlink/route/tc.py \
+	python/netlink/route/links/__init__.py \
+	python/netlink/route/links/dummy.py \
+	python/netlink/route/links/inet.py \
+	python/netlink/route/links/vlan.py \
+	python/netlink/route/qdisc/__init__.py \
+	python/netlink/route/qdisc/htb.py \
+	\
+	python/tests/test-create-bridge.py
+
+###############################################################################
+
 if ENABLE_CLI
 pkgconfig_DATA += libnl-cli-3.0.pc
 endif
diff --git a/configure.ac b/configure.ac
index 04a64d3..b72f9d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,14 +138,7 @@ libnl-idiag-3.0.pc
 src/Makefile
 src/lib/Makefile
 tests/Makefile
-python/Makefile
 python/setup.py
-python/doc/Makefile
-python/examples/Makefile
-python/netlink/Makefile
-python/netlink/genl/Makefile
-python/netlink/route/Makefile
-python/tests/Makefile
 include/netlink/version.h
 ])
 
diff --git a/python/Makefile.am b/python/Makefile.am
deleted file mode 100644
index a1a3426..0000000
--- a/python/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-SUBDIRS = doc examples netlink tests
diff --git a/python/doc/Makefile.am b/python/doc/Makefile.am
deleted file mode 100644
index a2fe6f2..0000000
--- a/python/doc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Makefile -*-
-
-EXTRA_DIST = \
-	conf.py \
-	core.rst \
-	index.rst \
-	route_addr.rst \
-	route.rst
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
deleted file mode 100644
index 1cea5e2..0000000
--- a/python/examples/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Makefile -*-
-
-EXTRA_DIST = \
-	iface.py \
-	nl80211.py \
-	wiphy.py
diff --git a/python/netlink/Makefile.am b/python/netlink/Makefile.am
deleted file mode 100644
index 1f6eaf8..0000000
--- a/python/netlink/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Makefile -*-
-
-SUBDIRS = route genl
-
-EXTRA_DIST = \
-	capi.i \
-	fixes.h \
-	__init__.py \
-	core.py \
-	util.py \
-	utils.h
diff --git a/python/netlink/genl/Makefile.am b/python/netlink/genl/Makefile.am
deleted file mode 100644
index 9e30904..0000000
--- a/python/netlink/genl/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Makefile -*-
-
-EXTRA_DIST = \
-	capi.i \
-	__init__.py
diff --git a/python/netlink/route/Makefile.am b/python/netlink/route/Makefile.am
deleted file mode 100644
index ef714f4..0000000
--- a/python/netlink/route/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Makefile -*-
-
-EXTRA_DIST = \
-	capi.i \
-	__init__.py \
-	address.py \
-	link.py \
-	tc.py \
-	links/__init__.py \
-	links/dummy.py \
-	links/inet.py \
-	links/vlan.py \
-	qdisc/__init__.py \
-	qdisc/htb.py
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
deleted file mode 100644
index 15f77fa..0000000
--- a/python/tests/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# -*- Makefile -*-
-
-EXTRA_DIST = \
-	test-create-bridge.py