diff options
| author | Michael Biebl <biebl@debian.org> | 2018-02-07 02:40:03 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-02-07 02:40:03 +0100 |
| commit | 77dfac263f463c1cdb8afb9b8c79a4e83bf08cd8 (patch) | |
| tree | e5288440b22e159a601450c2e5d40b013bdb4aa0 /Makefile.am | |
| parent | 3d9525cb641ac53c6d36bf5312710c22ae4bd926 (diff) | |
| parent | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (diff) | |
Update upstream source from tag 'upstream/1.10.4'
Update to upstream version '1.10.4' with Debian dir d2c0f877c591b3125f4e0cfcc711c04669d8d62b
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 941c1a25..639921d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,9 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update ############################################################################### +if WITH_LEGACY_LIBRARIES pkgconfig_DATA += NetworkManager.pc +endif ############################################################################### @@ -516,6 +518,14 @@ libnm_core_lib_c_real = \ libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c + +if WITH_JANSSON +libnm_core_lib_h_priv += \ + libnm-core/nm-json.h +libnm_core_lib_c_real += \ + libnm-core/nm-json.c +endif + libnm_core_lib_c_mkenums = \ libnm-core/nm-core-enum-types.c @@ -596,10 +606,6 @@ libnm_core_libnm_core_la_LIBADD = \ $(UUID_LIBS) \ $(LIBUDEV_LIBS) -if WITH_JANSSON -libnm_core_libnm_core_la_LIBADD += $(JANSSON_LIBS) -endif - libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) |