From eecd05b5bfd497129021432775bd656ef7a61241 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 18 Oct 2016 09:10:44 +0200
Subject: [PATCH] build: merge "src/devices/wifi/tests/Makefile.am" into
 toplevel Makefile

---
 Makefile.am                        | 25 ++++++++++++++++++++++++
 configure.ac                       |  2 --
 src/Makefile.am                    |  4 ----
 src/devices/wifi/Makefile.am       |  1 -
 src/devices/wifi/tests/Makefile.am | 31 ------------------------------
 5 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 src/devices/wifi/Makefile.am
 delete mode 100644 src/devices/wifi/tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dc8f6c9c9f..cc85445d44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2482,6 +2482,31 @@ check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
 
 check_local += check-local-devices-wifi
 
+check_programs += src/devices/wifi/tests/test-general
+
+src_devices_wifi_tests_test_general_SOURCES = \
+	src/devices/wifi/tests/test-general.c \
+	src/devices/wifi/nm-wifi-ap.c \
+	src/devices/wifi/nm-wifi-ap.h \
+	src/devices/wifi/nm-wifi-utils.c \
+	src/devices/wifi/nm-wifi-utils.h
+
+src_devices_wifi_tests_test_general_CPPFLAGS = \
+	-I$(top_builddir)/introspection \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I${top_srcdir}/src/platform \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/devices/wifi \
+	-I$(top_builddir)/src \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GLIB_CFLAGS)
+
+src_devices_wifi_tests_test_general_LDADD = src/libNetworkManager.la
+
 endif
 
 ###############################################################################
diff --git a/configure.ac b/configure.ac
index 1232d228fc..039bb00f64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1147,8 +1147,6 @@ src/rdisc/tests/Makefile
 src/devices/Makefile
 src/devices/tests/Makefile
 src/devices/team/Makefile
-src/devices/wifi/Makefile
-src/devices/wifi/tests/Makefile
 libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a6c5bf1b33..c36375841a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS =
 
-if WITH_WIFI
-SUBDIRS += devices/wifi
-endif
-
 if WITH_TEAMDCTL
 SUBDIRS += devices/team
 endif
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
deleted file mode 100644
index 1d42320f0d..0000000000
--- a/src/devices/wifi/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=tests
diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
deleted file mode 100644
index e12f4c0eb5..0000000000
--- a/src/devices/wifi/tests/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-if ENABLE_TESTS
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/introspection \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I${top_srcdir}/src/platform \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/devices/wifi \
-	-I$(top_builddir)/src \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS)
-
-noinst_PROGRAMS = test-general
-
-test_general_SOURCES = \
-	test-general.c \
-	$(srcdir)/../nm-wifi-ap.c \
-	$(srcdir)/../nm-wifi-ap.h \
-	$(srcdir)/../nm-wifi-utils.c \
-	$(srcdir)/../nm-wifi-utils.h
-
-test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
-
-@NM_LOG_COMPILER@
-TESTS = test-general
-
-endif