diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-06 14:40:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-06 20:41:20 +0200 |
| commit | 4d194c38339e7851fe54e7f336773370e2dbbeed (patch) | |
| tree | 212e002ac4a7c1eb9f57c915d0c192343a8315a8 | |
| parent | 8b1411712a68caed0869c888caba1b0f736ae26b (diff) | |
| download | NetworkManager-4d194c38339e7851fe54e7f336773370e2dbbeed.tar.gz | |
keyfile/build: don't build keyfile settings plugin as library
We directly include keyfile sources in NetworkManager by compiling
them into "libNetworkManager.la".
Drop unused libraries from the Makefile.
| -rw-r--r-- | src/settings/plugins/keyfile/Makefile.am | 49 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/tests/Makefile.am | 5 |
2 files changed, 2 insertions, 52 deletions
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index d2a51cf355..3c6155b9c6 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -1,48 +1 @@ -SUBDIRS = . tests - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DNMCONFDIR=\"$(nmconfdir)\" - -noinst_LTLIBRARIES = \ - libkeyfile-io.la \ - libnm-settings-plugin-keyfile.la - -##### I/O library for testcases ##### - -libkeyfile_io_la_SOURCES = \ - nms-keyfile-reader.c \ - nms-keyfile-reader.h \ - nms-keyfile-writer.c \ - nms-keyfile-writer.h \ - nms-keyfile-utils.c \ - nms-keyfile-utils.h - -libkeyfile_io_la_LIBADD = $(GLIB_LIBS) - -##################################### - -libnm_settings_plugin_keyfile_la_SOURCES = \ - nms-keyfile-connection.c \ - nms-keyfile-connection.h \ - nms-keyfile-plugin.c \ - nms-keyfile-plugin.h - -libnm_settings_plugin_keyfile_la_LIBADD = \ - libkeyfile-io.la - -keyfiledir=$(sysconfdir)/NetworkManager/system-connections - -install-data-hook: - $(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir) - +SUBDIRS = tests diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index 05689559ea..d7c48b1921 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -23,10 +23,7 @@ AM_CPPFLAGS = \ noinst_PROGRAMS = test-keyfile test_keyfile_SOURCES = \ - test-keyfile.c \ - ../nms-keyfile-reader.c \ - ../nms-keyfile-writer.c \ - ../nms-keyfile-utils.c + test-keyfile.c test_keyfile_LDADD = \ $(top_builddir)/src/libNetworkManager.la \ |