build: merge "examples/Makefile.am" into toplevel Makefileth/non-recursive-make-bgo772985

13 files changed, 59 insertions, 75 deletions

diff --git a/Makefile.am b/Makefile.am
index a050dd24d3..28aaa6c2aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,6 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 SUBDIRS = \
 	. \
 	po \
-	examples \
 	docs/libnm \
 	docs/api
 
diff --git a/Makefile.examples b/Makefile.examples
index 08499553a0..d1587c97d4 100644
--- a/Makefile.examples
+++ b/Makefile.examples
@@ -118,3 +118,62 @@ EXTRA_DIST += \
 	examples/C/qt/change-ipv4-addresses.cpp \
 	examples/C/qt/monitor-nm-running.cpp
 
+###############################################################################
+# examples
+###############################################################################
+
+EXTRA_DIST += \
+	examples/dispatcher/10-ifcfg-rh-routes.sh \
+	examples/dispatcher/70-wifi-wired-exclusive.sh \
+	\
+	examples/lua/lgi/add-connection.lua \
+	examples/lua/lgi/list-connections.lua \
+	examples/lua/lgi/list-devices.lua \
+	examples/lua/lgi/show-wifi-networks.lua \
+	examples/lua/lgi/get-basic-nm-info.lua \
+	examples/lua/lgi/get-ips.lua \
+	examples/lua/lgi/change-vpn-username.lua \
+	examples/lua/lgi/deactivate-all.lua \
+	\
+	examples/python/dbus/nm-state.py \
+	examples/python/dbus/add-connection.py \
+	examples/python/dbus/add-connection-compat.py \
+	examples/python/dbus/add-wifi-eap-connection.py \
+	examples/python/dbus/add-wifi-psk-connection.py \
+	examples/python/dbus/vpn.py \
+	examples/python/dbus/update-secrets.py \
+	examples/python/dbus/list-connections.py \
+	examples/python/dbus/show-bssids.py \
+	examples/python/dbus/disconnect-device.py \
+	examples/python/dbus/get-active-connection-uuids.py \
+	examples/python/dbus/list-devices.py \
+	examples/python/dbus/update-ip4-method.py \
+	examples/python/dbus/is-wwan-default.py \
+	examples/python/dbus/wifi-hotspot.py \
+	examples/python/dbus/create-bond.py \
+	examples/python/dbus/wifi-active-ap.py\
+	\
+	examples/python/gi/list-connections.py \
+	examples/python/gi/device-state-ip4config.py \
+	examples/python/gi/firewall-zone.py \
+	examples/python/gi/show-wifi-networks.py \
+	examples/python/gi/get_ips.py \
+	examples/python/gi/add_connection.py \
+	examples/python/gi/get-active-connections.py \
+	examples/python/gi/update-ip4-method.py \
+	examples/python/gi/deactivate-all.py \
+	examples/python/gi/README \
+	\
+	examples/python/python-networkmanager/README \
+	\
+	examples/ruby/add-connection.rb \
+	examples/ruby/get-basic-nm-info.rb \
+	examples/ruby/list-devices.rb \
+	\
+	examples/shell/nm-logging.sh \
+	examples/shell/get-hostname.sh \
+	examples/shell/list-devices.sh \
+	examples/shell/disconnect-device.sh \
+	examples/shell/active-wifi.sh \
+	\
+	$(NULL)
diff --git a/configure.ac b/configure.ac
index b2c6501b8d..32282ddb15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1151,16 +1151,6 @@ docs/libnm-util/version.xml
 docs/libnm/Makefile
 docs/libnm/version.xml
 NetworkManager.pc
-examples/Makefile
-examples/shell/Makefile
-examples/python/Makefile
-examples/python/dbus/Makefile
-examples/python/gi/Makefile
-examples/python/python-networkmanager/Makefile
-examples/ruby/Makefile
-examples/lua/Makefile
-examples/lua/lgi/Makefile
-examples/dispatcher/Makefile
 ])
 AC_CONFIG_SUBDIRS([libndp])
 AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index aeb6425d40..0000000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS= \
-	shell \
-	python \
-	ruby \
-	lua \
-	dispatcher
diff --git a/examples/dispatcher/Makefile.am b/examples/dispatcher/Makefile.am
deleted file mode 100644
index 0089d5fe7b..0000000000
--- a/examples/dispatcher/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
-	10-ifcfg-rh-routes.sh \
-	70-wifi-wired-exclusive.sh
-
diff --git a/examples/lua/Makefile.am b/examples/lua/Makefile.am
deleted file mode 100644
index bf14f68299..0000000000
--- a/examples/lua/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS= lgi
-
diff --git a/examples/lua/lgi/Makefile.am b/examples/lua/lgi/Makefile.am
deleted file mode 100644
index ce5c8f5c90..0000000000
--- a/examples/lua/lgi/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-EXTRA_DIST = \
-	add-connection.lua \
-	list-connections.lua \
-	list-devices.lua \
-	show-wifi-networks.lua \
-	get-basic-nm-info.lua \
-	get-ips.lua \
-	change-vpn-username.lua \
-	deactivate-all.lua
diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am
deleted file mode 100644
index cd3ce3ed90..0000000000
--- a/examples/python/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS= dbus gi python-networkmanager
-
diff --git a/examples/python/dbus/Makefile.am b/examples/python/dbus/Makefile.am
deleted file mode 100644
index 0a89dc5663..0000000000
--- a/examples/python/dbus/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-EXTRA_DIST = \
-	nm-state.py \
-	add-connection.py \
-	add-connection-compat.py \
-	add-wifi-eap-connection.py \
-	add-wifi-psk-connection.py \
-	vpn.py \
-	update-secrets.py \
-	list-connections.py \
-	show-bssids.py \
-	disconnect-device.py \
-	get-active-connection-uuids.py \
-	list-devices.py \
-	update-ip4-method.py \
-	is-wwan-default.py \
-	wifi-hotspot.py \
-	create-bond.py \
-	wifi-active-ap.py
diff --git a/examples/python/gi/Makefile.am b/examples/python/gi/Makefile.am
deleted file mode 100644
index 9c69407f49..0000000000
--- a/examples/python/gi/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = \
-	list-connections.py \
-	device-state-ip4config.py \
-	firewall-zone.py \
-	show-wifi-networks.py \
-	get_ips.py \
-	add_connection.py \
-	get-active-connections.py \
-	update-ip4-method.py \
-	deactivate-all.py \
-	README
diff --git a/examples/python/python-networkmanager/Makefile.am b/examples/python/python-networkmanager/Makefile.am
deleted file mode 100644
index 45fe750c45..0000000000
--- a/examples/python/python-networkmanager/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
-	README
diff --git a/examples/ruby/Makefile.am b/examples/ruby/Makefile.am
deleted file mode 100644
index 14f97ef89d..0000000000
--- a/examples/ruby/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
-	add-connection.rb \
-	get-basic-nm-info.rb \
-	list-devices.rb
diff --git a/examples/shell/Makefile.am b/examples/shell/Makefile.am
deleted file mode 100644
index e4b6f6c795..0000000000
--- a/examples/shell/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = \
-	nm-logging.sh \
-	get-hostname.sh \
-	list-devices.sh \
-	disconnect-device.sh \
-	active-wifi.sh