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

Browse source
This commit is contained in:
Thomas Haller 2016-10-18 09:06:00 +02:00
parent ecb9f140cf
commit 123b66b9f4
4 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile.am
View file

@ -2556,6 +2556,28 @@ check_local += check-local-devices-team
endif
###############################################################################
# src/dnsmasq-manager/tests
###############################################################################
check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils
src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dnsmasq-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \
src/libNetworkManager.la
###############################################################################
girdir = $(datadir)/gir-1.0

1
configure.ac
View file

@ -1137,7 +1137,6 @@ shared/nm-version-macros.h
src/Makefile
src/tests/Makefile
src/tests/config/Makefile
src/dnsmasq-manager/tests/Makefile
src/supplicant-manager/tests/Makefile
src/supplicant-manager/tests/certs/Makefile
src/platform/Makefile

1
src/Makefile.am
View file

@ -2,7 +2,6 @@ SUBDIRS =
if ENABLE_TESTS
SUBDIRS += \
dnsmasq-manager/tests \
platform \
devices \
rdisc \

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

@ -1,24 +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/dnsmasq-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
noinst_PROGRAMS = test-dnsmasq-utils
test_dnsmasq_utils_SOURCES = \
test-dnsmasq-utils.c
test_dnsmasq_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@NM_LOG_COMPILER@
TESTS = test-dnsmasq-utils