build: merge "src/devices/adsl/Makefile.am" into toplevel Makefile

4 files changed, 40 insertions, 41 deletions

diff --git a/Makefile.am b/Makefile.am
index 87b124f482..d15b2bc8f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2220,6 +2220,45 @@ EXTRA_DIST += \
 	src/settings/plugins/ifnet/tests/test_ca_cert.pem
 
 ###############################################################################
+# src/devices/adsl
+###############################################################################
+
+pkglib_LTLIBRARIES += src/devices/adsl/libnm-device-plugin-adsl.la
+
+src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
+	src/devices/adsl/nm-atm-manager.c \
+	src/devices/adsl/nm-device-adsl.c \
+	src/devices/adsl/nm-device-adsl.h
+
+src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src \
+	-I${top_srcdir}/src/devices \
+	-I${top_srcdir}/src/platform \
+	-I${top_builddir}/introspection \
+	-I${top_srcdir}/shared \
+	-I$(top_builddir)/shared \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm-core \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GUDEV_CFLAGS)
+
+src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
+
+src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
+	introspection/libnmdbus.la \
+	$(GUDEV_LIBS)
+
+check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
+	$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(top_srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so)
+
+check_local += check-local-devices-adsl
+
+###############################################################################
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/configure.ac b/configure.ac
index 7cef906b32..efdee1bf25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1146,7 +1146,6 @@ src/rdisc/Makefile
 src/rdisc/tests/Makefile
 src/devices/Makefile
 src/devices/tests/Makefile
-src/devices/adsl/Makefile
 src/devices/bluetooth/Makefile
 src/devices/team/Makefile
 src/devices/wifi/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 8479fbe40a..8be8860f07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS = \
-	devices/adsl
+SUBDIRS =
 
 if WITH_MODEM_MANAGER_1
 SUBDIRS += devices/wwan	devices/bluetooth
diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
deleted file mode 100644
index 573f19a8c3..0000000000
--- a/src/devices/adsl/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-include $(GLIB_MAKEFILE)
-
-include $(top_srcdir)/nm.mk
-
-@GNOME_CODE_COVERAGE_RULES@
-
-AM_CPPFLAGS = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/platform \
-	-I${top_builddir}/introspection \
-	-I${top_srcdir}/shared \
-	-I$(top_builddir)/shared \
-	-I${top_builddir}/libnm-core \
-	-I${top_srcdir}/libnm-core \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GUDEV_CFLAGS)
-
-pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la
-
-libnm_device_plugin_adsl_la_SOURCES = \
-	nm-atm-manager.c \
-	nm-device-adsl.c \
-	nm-device-adsl.h
-
-libnm_device_plugin_adsl_la_LDFLAGS = \
-	-module -avoid-version \
-	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
-
-libnm_device_plugin_adsl_la_LIBADD = \
-	$(top_builddir)/introspection/libnmdbus.la \
-	$(GUDEV_LIBS)
-
-check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-adsl.so "$(top_srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-adsl.so)