From b648772fc437744f9afc1037496e63b2b23a2911 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 18 Oct 2016 14:01:56 +0200
Subject: [PATCH] build: merge "examples/C/qt/Makefile.am" into toplevel
 Makefile

---
 Makefile.examples         | 58 +++++++++++++++++++++++++++++++++++++++
 configure.ac              |  2 --
 examples/C/Makefile.am    |  5 ----
 examples/C/qt/Makefile.am | 46 -------------------------------
 examples/Makefile.am      |  1 -
 5 files changed, 58 insertions(+), 54 deletions(-)
 delete mode 100644 examples/C/Makefile.am
 delete mode 100644 examples/C/qt/Makefile.am

diff --git a/Makefile.examples b/Makefile.examples
index 87ae9901ea..08499553a0 100644
--- a/Makefile.examples
+++ b/Makefile.examples
@@ -60,3 +60,61 @@ examples_C_glib_monitor_nm_running_gdbus_LDADD = \
 examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
 examples_C_glib_monitor_nm_state_gdbus_LDADD = \
 	$(GLIB_LIBS)
+
+###############################################################################
+# examples/C/qt
+###############################################################################
+
+if WITH_QT
+
+examples_C_qt_cppflags = \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${builddir}/examples/C/qt \
+	$(DBUS_CFLAGS) \
+	$(QT_CFLAGS)
+
+check_programs_norun += \
+	examples/C/qt/add-connection-wired \
+	examples/C/qt/list-connections \
+	examples/C/qt/change-ipv4-addresses \
+	examples/C/qt/monitor-nm-running
+
+examples_C_qt_add_connection_wired_SOURCES = examples/C/qt/add-connection-wired.cpp
+examples_C_qt_add_connection_wired_CPPFLAGS = $(examples_C_qt_cppflags)
+examples_C_qt_add_connection_wired_LDADD = \
+	$(DBUS_LIBS) \
+	$(QT_LIBS)
+
+examples_C_qt_list_connections_SOURCES = examples/C/qt/list-connections.cpp
+examples_C_qt_list_connections_CPPFLAGS = $(examples_C_qt_cppflags)
+examples_C_qt_list_connections_LDADD = \
+	$(DBUS_LIBS) \
+	$(QT_LIBS)
+
+examples_C_qt_change_ipv4_addresses_SOURCES = examples/C/qt/change-ipv4-addresses.cpp
+examples_C_qt_change_ipv4_addresses_CPPFLAGS = $(examples_C_qt_cppflags)
+examples_C_qt_change_ipv4_addresses_LDADD = \
+	$(DBUS_LIBS) \
+	$(QT_LIBS)
+
+examples_C_qt_monitor_nm_running_SOURCES = examples/C/qt/monitor-nm-running.cpp
+examples_C_qt_monitor_nm_running_CPPFLAGS = $(examples_C_qt_cppflags)
+examples_C_qt_monitor_nm_running_LDADD = \
+	$(DBUS_LIBS) \
+	$(QT_LIBS)
+
+examples/C/qt/monitor-nm-running.moc: examples/C/qt/monitor-nm-running.cpp
+	$(AM_V_GEN) $(MOC) -i $< -o $@
+
+BUILT_SOURCES += \
+	examples/C/qt/monitor-nm-running.moc
+
+endif
+
+EXTRA_DIST += \
+	examples/C/qt/add-connection-wired.cpp \
+	examples/C/qt/list-connections.cpp \
+	examples/C/qt/change-ipv4-addresses.cpp \
+	examples/C/qt/monitor-nm-running.cpp
+
diff --git a/configure.ac b/configure.ac
index f67ba45710..b2c6501b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1160,8 +1160,6 @@ examples/python/python-networkmanager/Makefile
 examples/ruby/Makefile
 examples/lua/Makefile
 examples/lua/lgi/Makefile
-examples/C/Makefile
-examples/C/qt/Makefile
 examples/dispatcher/Makefile
 ])
 AC_CONFIG_SUBDIRS([libndp])
diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
deleted file mode 100644
index d9a84a6f66..0000000000
--- a/examples/C/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS =
-
-if WITH_QT
-SUBDIRS += qt
-endif
diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am
deleted file mode 100644
index aff4c48e24..0000000000
--- a/examples/C/qt/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-AM_CPPFLAGS = \
-	-I${top_srcdir}/libnm-core \
-	-I${top_builddir}/libnm-core \
-	$(DBUS_CFLAGS) \
-	$(QT_CFLAGS)
-
-noinst_PROGRAMS = \
-	add-connection-wired \
-	list-connections \
-	change-ipv4-addresses \
-	monitor-nm-running
-
-add_connection_wired_SOURCES = add-connection-wired.cpp
-add_connection_wired_LDADD = \
-	$(DBUS_LIBS) \
-	$(QT_LIBS)
-
-list_connections_SOURCES = list-connections.cpp
-list_connections_LDADD = \
-	$(DBUS_LIBS) \
-	$(QT_LIBS)
-
-change_ipv4_addresses_SOURCES = change-ipv4-addresses.cpp
-change_ipv4_addresses_LDADD = \
-	$(DBUS_LIBS) \
-	$(QT_LIBS)
-
-monitor_nm_running_SOURCES = monitor-nm-running.cpp
-monitor_nm_running_LDADD = \
-	$(DBUS_LIBS) \
-	$(QT_LIBS)
-
-monitor-nm-running.moc: monitor-nm-running.cpp
-	$(AM_V_GEN) $(MOC) -i $< -o $@
-
-BUILT_SOURCES = \
-	monitor-nm-running.moc
-
-EXTRA_DIST = \
-	add-connection-wired.cpp \
-	list-connections.cpp \
-	change-ipv4-addresses.cpp \
-	monitor-nm-running.cpp
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3521b4cecd..aeb6425d40 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,5 +3,4 @@ SUBDIRS= \
 	python \
 	ruby \
 	lua \
-	C \
 	dispatcher