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/tests/config/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-18 11:54:58 +02:00
parent a0bb990f39
commit 1d8934e705
4 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Makefile.am
View file

@ -2794,6 +2794,44 @@ EXTRA_DIST += \
src/supplicant-manager/tests/certs/test-ca-cert.pem \
src/supplicant-manager/tests/certs/test-cert.p12
###############################################################################
# src/tests/config
###############################################################################
check_programs += src/tests/config/test-config
src_tests_config_test_config_SOURCES = \
src/tests/config/nm-test-device.c \
src/tests/config/nm-test-device.h \
src/tests/config/test-config.c
src_tests_config_test_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/devices \
-I${top_srcdir}/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \
-DBUILDDIR=\""$(abs_builddir)/src/tests/config"\"
src_tests_config_test_config_LDADD = \
src/libNetworkManagerTest.la
EXTRA_DIST += \
src/tests/config/NetworkManager.conf \
src/tests/config/NetworkManager.state \
src/tests/config/bad.conf \
src/tests/config/global-dns-invalid.conf \
src/tests/config/conf.d/00-overrides.conf \
src/tests/config/conf.d/10-more.conf \
src/tests/config/conf.d/20-config-enable-1.conf \
src/tests/config/conf.d/90-last.conf
###############################################################################
girdir = $(datadir)/gir-1.0

1
configure.ac
View file

@ -1136,7 +1136,6 @@ Makefile
shared/nm-version-macros.h
src/Makefile
src/tests/Makefile
src/tests/config/Makefile
libnm/libnm.pc
libnm-util/libnm-util.pc
libnm-util/Makefile

2
src/tests/Makefile.am
View file

@ -1,5 +1,3 @@
SUBDIRS = config
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \

37
src/tests/config/Makefile.am
View file

@ -1,37 +0,0 @@
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/devices \
-I${top_srcdir}/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DSRCDIR=\""$(abs_srcdir)"\" \
-DBUILDDIR=\""$(abs_builddir)"\"
noinst_PROGRAMS = \
test-config
test_config_SOURCES = \
nm-test-device.c \
nm-test-device.h \
test-config.c
test_config_LDADD = \
$(top_builddir)/src/libNetworkManagerTest.la
@NM_LOG_COMPILER@
TESTS = test-config
EXTRA_DIST = \
NetworkManager.conf \
NetworkManager.state \
bad.conf \
global-dns-invalid.conf \
conf.d/00-overrides.conf \
conf.d/10-more.conf \
conf.d/20-config-enable-1.conf \
conf.d/90-last.conf