system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-01 13:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "libnm-glib/tests/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-18 15:53:05 +02:00
parent 8027e09be4
commit 0f09b1d1cc
4 changed files with 46 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Makefile.am
View file

@ -75,14 +75,7 @@ SUBDIRS = \
. \
po \
man \
examples
if WITH_LEGACY_LIBRARIES
SUBDIRS += \
libnm-glib
endif
SUBDIRS += \
examples \
docs \
vapi
@ -3950,6 +3943,51 @@ check-local-exports-libnm-glib:
check_local += check-local-exports-libnm-glib
###############################################################################
# libnm-glib/tests
###############################################################################
libnm_glib_tests_cppflags = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
check_programs += \
libnm-glib/tests/test-nm-client \
libnm-glib/tests/test-remote-settings-client
libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
libnm_glib_tests_test_nm_client_SOURCES = \
shared/nm-test-utils-impl.c \
shared/nm-test-libnm-utils.h \
libnm-glib/tests/test-nm-client.c
libnm_glib_tests_test_nm_client_LDADD = \
libnm-util/libnm-util.la \
libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
libnm_glib_tests_test_remote_settings_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
libnm_glib_tests_test_remote_settings_client_SOURCES = \
shared/nm-test-utils-impl.c \
shared/nm-test-libnm-utils.h \
libnm-glib/tests/test-remote-settings-client.c
libnm_glib_tests_test_remote_settings_client_LDADD = \
libnm-util/libnm-util.la \
libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
endif
###############################################################################

2
configure.ac
View file

@ -1138,8 +1138,6 @@ libnm/libnm.pc
libnm-util/libnm-util.pc
libnm-glib/libnm-glib.pc
libnm-glib/libnm-glib-vpn.pc
libnm-glib/Makefile
libnm-glib/tests/Makefile
man/Makefile
man/common.ent
po/Makefile.in

1
libnm-glib/Makefile.am
View file

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

47
libnm-glib/tests/Makefile.am
View file

@ -1,47 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
noinst_PROGRAMS = $(TESTS)
@NM_LOG_COMPILER@
TESTS = test-nm-client test-remote-settings-client
####### NMClient and non-settings tests #######
test_nm_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-nm-client.c
test_nm_client_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
####### remote settings client test #######
test_remote_settings_client_SOURCES = \
$(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-remote-settings-client.c
test_remote_settings_client_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
###########################################
endif