system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-04 15:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "src/supplicant-manager/tests/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-18 11:29:57 +02:00
parent e52a5e1146
commit a0bb990f39
5 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Makefile.am
View file

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

2
configure.ac
View file

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

1
src/Makefile.am
View file

@ -2,6 +2,5 @@ SUBDIRS =
if ENABLE_TESTS
SUBDIRS += \
supplicant-manager/tests \
tests
endif

24
src/supplicant-manager/tests/Makefile.am
View file

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

6
src/supplicant-manager/tests/certs/Makefile.am
View file

@ -1,6 +0,0 @@
CERTS = \
test-ca-cert.pem \
test-cert.p12
EXTRA_DIST = $(CERTS)