mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-01 13:55:36 +00:00
build: merge "libnm-util/tests/Makefile.am" into toplevel Makefile
This commit is contained in:
Thomas Haller
parent
fa0acb2042
commit
7c66a6be17
57
Makefile.am
57
Makefile.am
|
|
@ -76,7 +76,6 @@ SUBDIRS = \
|
|||
|
||||
if WITH_LEGACY_LIBRARIES
|
||||
SUBDIRS += \
|
||||
libnm-util \
|
||||
libnm-glib
|
||||
endif
|
||||
|
||||
|
|
@ -3664,6 +3663,62 @@ check-local-exports-libnm-util: libnm-util/libnm-util.la
|
|||
|
||||
check_local += check-local-exports-libnm-util
|
||||
|
||||
###############################################################################
|
||||
# libnm-util/tests
|
||||
###############################################################################
|
||||
|
||||
libnm_util_tests_cppflags = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_builddir)/libnm-util \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(DBUS_CFLAGS) \
|
||||
-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
|
||||
-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
|
||||
|
||||
libnm_util_tests_ldadd = \
|
||||
libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
check_programs += \
|
||||
libnm-util/tests/test-settings-defaults \
|
||||
libnm-util/tests/test-crypto \
|
||||
libnm-util/tests/test-secrets \
|
||||
libnm-util/tests/test-general \
|
||||
libnm-util/tests/test-setting-8021x \
|
||||
libnm-util/tests/test-setting-dcb
|
||||
|
||||
check_programs_norun += \
|
||||
libnm-util/tests/test-libnm-linking
|
||||
|
||||
libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_crypto_LDADD = \
|
||||
libnm-util/libtest-crypto.la \
|
||||
$(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking
|
||||
libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd)
|
||||
|
||||
libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags)
|
||||
libnm_util_tests_test_libnm_linking_LDADD = \
|
||||
$(top_builddir)/libnm/libnm.la \
|
||||
$(libnm_util_tests_ldadd)
|
||||
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
|
|
|
|||
|
|
@ -1136,8 +1136,6 @@ Makefile
|
|||
shared/nm-version-macros.h
|
||||
libnm/libnm.pc
|
||||
libnm-util/libnm-util.pc
|
||||
libnm-util/Makefile
|
||||
libnm-util/tests/Makefile
|
||||
libnm-glib/libnm-glib.pc
|
||||
libnm-glib/libnm-glib-vpn.pc
|
||||
libnm-glib/Makefile
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
SUBDIRS = tests
|
||||
|
|
@ -1,85 +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 \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(DBUS_CFLAGS) \
|
||||
-DBUILD_DIR=\"$(abs_builddir)\" \
|
||||
-DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\"
|
||||
|
||||
@NM_LOG_COMPILER@
|
||||
TESTS = \
|
||||
test-settings-defaults \
|
||||
test-crypto \
|
||||
test-secrets \
|
||||
test-general \
|
||||
test-setting-8021x \
|
||||
test-setting-dcb
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
$(TESTS) \
|
||||
test-libnm-linking
|
||||
|
||||
test_settings_defaults_SOURCES = \
|
||||
test-settings-defaults.c
|
||||
|
||||
test_settings_defaults_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
test_crypto_SOURCES = \
|
||||
test-crypto.c
|
||||
|
||||
test_crypto_LDADD = \
|
||||
$(top_builddir)/libnm-util/libtest-crypto.la \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
test_secrets_SOURCES = \
|
||||
test-secrets.c
|
||||
|
||||
test_secrets_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
test_general_SOURCES = \
|
||||
test-general.c
|
||||
|
||||
test_general_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
test_general_DEPENDENCIES = test-libnm-linking
|
||||
|
||||
test_setting_8021x_SOURCES = \
|
||||
test-setting-8021x.c
|
||||
|
||||
test_setting_8021x_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
test_setting_dcb_SOURCES = \
|
||||
test-setting-dcb.c
|
||||
|
||||
test_setting_dcb_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
test_libnm_linking_SOURCES = \
|
||||
test-libnm-linking.c
|
||||
|
||||
test_libnm_linking_LDADD = \
|
||||
$(top_builddir)/libnm/libnm.la \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
endif
|
||||
Loading…
Reference in a new issue