mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-04 15:21:12 +00:00
build: merge "src/supplicant-manager/tests/Makefile.am" into toplevel Makefile
This commit is contained in:
parent
e52a5e1146
commit
a0bb990f39
25
Makefile.am
25
Makefile.am
|
@ -2769,6 +2769,31 @@ src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags)
|
|||
src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags)
|
||||
src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd)
|
||||
|
||||
###############################################################################
|
||||
# src/supplicant-manager/tests
|
||||
###############################################################################
|
||||
|
||||
check_programs += src/supplicant-manager/tests/test-supplicant-config
|
||||
|
||||
src_supplicant_manager_tests_test_supplicant_config_CPPFLAGS = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/supplicant-manager \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
src_supplicant_manager_tests_test_supplicant_config_LDADD = \
|
||||
src/libNetworkManager.la
|
||||
|
||||
EXTRA_DIST += \
|
||||
src/supplicant-manager/tests/certs/test-ca-cert.pem \
|
||||
src/supplicant-manager/tests/certs/test-cert.p12
|
||||
|
||||
###############################################################################
|
||||
|
||||
girdir = $(datadir)/gir-1.0
|
||||
|
|
|
@ -1137,8 +1137,6 @@ shared/nm-version-macros.h
|
|||
src/Makefile
|
||||
src/tests/Makefile
|
||||
src/tests/config/Makefile
|
||||
src/supplicant-manager/tests/Makefile
|
||||
src/supplicant-manager/tests/certs/Makefile
|
||||
libnm/libnm.pc
|
||||
libnm-util/libnm-util.pc
|
||||
libnm-util/Makefile
|
||||
|
|
|
@ -2,6 +2,5 @@ SUBDIRS =
|
|||
|
||||
if ENABLE_TESTS
|
||||
SUBDIRS += \
|
||||
supplicant-manager/tests \
|
||||
tests
|
||||
endif
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
SUBDIRS=certs
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/supplicant-manager \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
-DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
noinst_PROGRAMS = test-supplicant-config
|
||||
|
||||
test_supplicant_config_SOURCES = \
|
||||
test-supplicant-config.c
|
||||
|
||||
test_supplicant_config_LDADD = \
|
||||
$(top_builddir)/src/libNetworkManager.la
|
||||
|
||||
@NM_LOG_COMPILER@
|
||||
TESTS = test-supplicant-config
|
|
@ -1,6 +0,0 @@
|
|||
CERTS = \
|
||||
test-ca-cert.pem \
|
||||
test-cert.p12
|
||||
|
||||
EXTRA_DIST = $(CERTS)
|
||||
|
Loading…
Reference in a new issue