system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Haller 2016-10-18 09:10:44 +02:00
parent da006929dd
commit eecd05b5bf
5 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile.am
View File

@ -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
###############################################################################

2
configure.ac
View File

@ -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

4
src/Makefile.am
View File

@ -1,9 +1,5 @@
SUBDIRS =
if WITH_WIFI
SUBDIRS += devices/wifi
endif
if WITH_TEAMDCTL
SUBDIRS += devices/team
endif

1
src/devices/wifi/Makefile.am
View File

@ -1 +0,0 @@
SUBDIRS=tests

31
src/devices/wifi/tests/Makefile.am
View File

@ -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