build: merge "examples/C/glib/Makefile.am" into toplevel Makefile

5 files changed, 67 insertions, 57 deletions

diff --git a/Makefile.am b/Makefile.am
index 4d9f1c7604..a050dd24d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4256,6 +4256,10 @@ CLEANFILES += \
 
 ###############################################################################
 
+include Makefile.examples
+
+###############################################################################
+
 check-local: $(check_local)
 
 dist-hook: $(dist_hook)
diff --git a/Makefile.examples b/Makefile.examples
new file mode 100644
index 0000000000..87ae9901ea
--- /dev/null
+++ b/Makefile.examples
@@ -0,0 +1,62 @@
+###############################################################################
+# examples/C/glib
+###############################################################################
+
+examples_C_glib_cppflags = \
+	-I${top_srcdir}/shared \
+	-I${top_builddir}/shared \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm \
+	-I${top_builddir}/libnm \
+	$(GLIB_CFLAGS) \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
+
+examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
+examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags)
+
+check_programs_norun += \
+	examples/C/glib/add-connection-gdbus \
+	examples/C/glib/add-connection-libnm \
+	examples/C/glib/get-active-connections-gdbus \
+	examples/C/glib/get-ap-info-libnm \
+	examples/C/glib/list-connections-gdbus \
+	examples/C/glib/list-connections-libnm \
+	examples/C/glib/monitor-nm-running-gdbus \
+	examples/C/glib/monitor-nm-state-gdbus
+
+examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
+examples_C_glib_add_connection_gdbus_LDADD = \
+	$(GLIB_LIBS) \
+	$(UUID_LIBS)
+
+examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
+examples_C_glib_add_connection_libnm_LDADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
+examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
+examples_C_glib_get_active_connections_gdbus_LDADD = \
+	$(GLIB_LIBS)
+
+examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
+examples_C_glib_get_ap_info_libnm_LDADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
+examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
+examples_C_glib_list_connections_gdbus_LDADD = \
+	$(GLIB_LIBS)
+
+examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
+examples_C_glib_list_connections_libnm_LDADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
+examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
+examples_C_glib_monitor_nm_running_gdbus_LDADD = \
+	$(GLIB_LIBS)
+
+examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
+examples_C_glib_monitor_nm_state_gdbus_LDADD = \
+	$(GLIB_LIBS)
diff --git a/configure.ac b/configure.ac
index 9a15e354f1..f67ba45710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1161,7 +1161,6 @@ examples/ruby/Makefile
 examples/lua/Makefile
 examples/lua/lgi/Makefile
 examples/C/Makefile
-examples/C/glib/Makefile
 examples/C/qt/Makefile
 examples/dispatcher/Makefile
 ])
diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
index 4502e9bb78..d9a84a6f66 100644
--- a/examples/C/Makefile.am
+++ b/examples/C/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS= glib
+SUBDIRS =
 
 if WITH_QT
 SUBDIRS += qt
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
deleted file mode 100644
index e3d655d07b..0000000000
--- a/examples/C/glib/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-AM_CPPFLAGS = \
-	-I${top_srcdir}/shared \
-	-I$(top_builddir)/shared \
-	-I${top_srcdir}/libnm-core \
-	-I${top_builddir}/libnm-core \
-	-I${top_srcdir}/libnm \
-	-I${top_builddir}/libnm \
-	$(GLIB_CFLAGS) \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
-
-noinst_PROGRAMS = \
-	add-connection-gdbus \
-	add-connection-libnm \
-	get-active-connections-gdbus \
-	get-ap-info-libnm \
-	list-connections-gdbus \
-	list-connections-libnm \
-	monitor-nm-running-gdbus \
-	monitor-nm-state-gdbus
-
-add_connection_gdbus_SOURCES = add-connection-gdbus.c
-add_connection_gdbus_LDADD = \
-	$(GLIB_LIBS) \
-	$(UUID_LIBS)
-
-add_connection_libnm_SOURCES = add-connection-libnm.c
-add_connection_libnm_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS)
-
-get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c
-get_active_connections_gdbus_LDADD = \
-	$(GLIB_LIBS)
-
-get_ap_info_libnm_SOURCES = get-ap-info-libnm.c
-get_ap_info_libnm_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS)
-
-list_connections_gdbus_SOURCES = list-connections-gdbus.c
-list_connections_gdbus_LDADD = \
-	$(GLIB_LIBS)
-
-list_connections_libnm_SOURCES = list-connections-libnm.c
-list_connections_libnm_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS)
-
-monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c
-monitor_nm_running_gdbus_LDADD = \
-	$(GLIB_LIBS)
-
-monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c
-monitor_nm_state_gdbus_LDADD = \
-	$(GLIB_LIBS)