summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-07-08 12:46:44 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-08-11 11:54:07 +0200
commit663c85a41a28fb33fc3f52fc7363b051da9bef68 (patch)
treeed51b9a1c4d1ab9f3afdee79cc990e1a29584ef6
parente02d56c50c80bccf9f43e6574903c3c253d49656 (diff)
downloadNetworkManager-663c85a41a28fb33fc3f52fc7363b051da9bef68.tar.gz
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.
-rw-r--r--src/Makefile.am14
-rw-r--r--src/platform/tests/Makefile.am6
-rw-r--r--src/rdisc/tests/Makefile.am4
-rw-r--r--src/tests/Makefile.am2
-rw-r--r--src/tests/config/Makefile.am2
5 files changed, 18 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 04b8b694fc..92df54bd5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 = \
diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 5af4ce91d4..0633dd28ba 100644
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -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@
diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index 4e71fac4b5..b054179e8b 100644
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -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
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 70eb25bfd1..3e9de4c8cb 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -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 \
diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
index ee8254bab3..d0cb797d15 100644
--- a/src/tests/config/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -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