bulid: don't link NMFakePlatform into NetworkManager binary

It's only used for testing. Add a new object libNetworkManagerTest.la
that contains libNetworkManager.la including the test stubs.
This commit is contained in:
Thomas Haller 2016-07-08 12:46:44 +02:00 committed by Beniamino Galvani
parent e02d56c50c
commit 663c85a41a
5 changed files with 18 additions and 10 deletions

View file

@ -49,6 +49,7 @@ AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(to
noinst_LTLIBRARIES = \
libNetworkManager.la \
libNetworkManagerTest.la \
libnm-iface-helper.la \
libsystemd-nm.la
@ -324,8 +325,6 @@ libNetworkManager_la_SOURCES = \
platform/nm-platform.h \
platform/nm-linux-platform.c \
platform/nm-linux-platform.h \
platform/nm-fake-platform.c \
platform/nm-fake-platform.h \
platform/wifi/wifi-utils-nl80211.c \
platform/wifi/wifi-utils-nl80211.h \
platform/wifi/wifi-utils-private.h \
@ -524,6 +523,17 @@ NetworkManager_LDFLAGS = \
-rdynamic \
-Wl,--version-script="$(srcdir)/NetworkManager.ver"
###############################################################################
libNetworkManagerTest_la_SOURCES = \
rdisc/nm-fake-rdisc.c \
rdisc/nm-fake-rdisc.h \
platform/nm-fake-platform.c \
platform/nm-fake-platform.h
libNetworkManagerTest_la_LIBADD = \
$(srcdir)/libNetworkManager.la
######################
libnm_iface_helper_la_SOURCES = \

View file

@ -28,7 +28,7 @@ TEST_SOURCES = \
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(CODE_COVERAGE_LDFLAGS)
PLATFORM_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
@GNOME_CODE_COVERAGE_RULES@
@ -109,12 +109,12 @@ test_cleanup_linux_LDADD = $(PLATFORM_LDADD)
test_nmp_object_SOURCES = \
test-nmp-object.c
test_nmp_object_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
test_general_SOURCES = \
test-general.c
test_general_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
@VALGRIND_RULES@

View file

@ -27,11 +27,9 @@ test_rdisc_linux_LDADD = \
$(top_builddir)/src/libNetworkManager.la
test_rdisc_fake_SOURCES = \
$(srcdir)/../nm-fake-rdisc.c \
$(srcdir)/../nm-fake-rdisc.h \
test-rdisc-fake.c
test_rdisc_fake_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
@VALGRIND_RULES@
TESTS = test-rdisc-fake

View file

@ -62,7 +62,7 @@ test_route_manager_fake_SOURCES = \
test-route-manager.c
test_route_manager_fake_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
test_route_manager_linux_SOURCES = \
$(top_srcdir)/src/platform/tests/test-common.c \

View file

@ -21,7 +21,7 @@ test_config_SOURCES = \
test-config.c
test_config_LDADD = \
$(top_builddir)/src/libNetworkManager.la
$(top_builddir)/src/libNetworkManagerTest.la
@VALGRIND_RULES@
TESTS = test-config