From 50f6b47074e01dffb8dc536c0a20961dcf28ae9b Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 7 Feb 2018 02:39:23 +0100
Subject: New upstream version 1.10.4

---
 Makefile.am | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

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)
 
-- 
cgit 1.3.0-6-gf8a5