diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-15 16:24:59 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-19 17:16:08 +0200 |
| commit | 7aefbcb622f855b039d3c26d9a2f3b1ecaa84a5a (patch) | |
| tree | 56c4c8af6a5fdb3854cb7bff64f30a754d77a12b /libnm | |
| parent | 9061432d5507718e29da4c659b46e5d129e006ed (diff) | |
| download | NetworkManager-7aefbcb622f855b039d3c26d9a2f3b1ecaa84a5a.tar.gz | |
build: merge "libnm/tests/Makefile.am" into toplevel Makefile
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/Makefile.am | 1 | ||||
| -rw-r--r-- | libnm/tests/Makefile.am | 61 |
2 files changed, 0 insertions, 62 deletions
diff --git a/libnm/Makefile.am b/libnm/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/libnm/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am deleted file mode 100644 index a143abaf51..0000000000 --- a/libnm/tests/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ - $(GLIB_CFLAGS) - -LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -noinst_PROGRAMS = $(TESTS) - -@NM_LOG_COMPILER@ --launch-dbus -TESTS = test-nm-client test-remote-settings-client test-secret-agent - -test_nm_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-nm-client.c - -test_remote_settings_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-remote-settings-client.c - -test_secret_agent_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-secret-agent.c -endif - -############################################################################### - -noinst_LTLIBRARIES = \ - libnm-vpn-plugin-utils-test.la - -libnm_vpn_plugin_utils_test_la_SOURCES = \ - $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \ - $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \ - $(NULL) - -libnm_vpn_plugin_utils_test_la_CFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_srcdir)/libnm \ - $(NULL) - -libnm_vpn_plugin_utils_test_la_LIBADD = \ - $(GLIB_LIBS) \ - $(NULL) - -############################################################################### - |