From 40962fa062ed681974c4ae826945d2ba9f304fb3 Mon Sep 17 00:00:00 2001
From: Alexander Kurilo <kamazee@gmail.com>
Date: Wed, 26 Jul 2017 19:08:09 +0300
Subject: [PATCH 1/1] build: fix building pppd plugin
Fixes: d434ad79a1002c37fc9654da62827b1d4d92a3d6
https://bugzilla.gnome.org/show_bug.cgi?id=785450b
(cherry picked from commit 4195187fbe5be348222c9a8472f7c9cf0e51d346)
---
Makefile.am | 3 ++-
Makefile.in | 25 +++++++++++++++++++------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 59ba941..8843648 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
+ shared/nm-utils/nm-shared-utils.c \
src/nm-fortisslvpn-pppd-plugin.c \
src/nm-ppp-status.h
src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
@@ -100,7 +101,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
-module -avoid-version
src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
src/libnm-fortisslvpn-pppd-service-dbus.la \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
$(LIBNM_LIBS)
###############################################################################
diff --git a/Makefile.in b/Makefile.in
index b239c4a..a888630 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -226,8 +226,9 @@ src_libnm_fortisslvpn_pppd_service_dbus_la_OBJECTS = \
$(nodist_src_libnm_fortisslvpn_pppd_service_dbus_la_OBJECTS)
src_nm_fortisslvpn_pppd_plugin_la_DEPENDENCIES = \
src/libnm-fortisslvpn-pppd-service-dbus.la \
- $(am__DEPENDENCIES_1)
-am_src_nm_fortisslvpn_pppd_plugin_la_OBJECTS = src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_src_nm_fortisslvpn_pppd_plugin_la_OBJECTS = shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo \
+ src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo
src_nm_fortisslvpn_pppd_plugin_la_OBJECTS = \
$(am_src_nm_fortisslvpn_pppd_plugin_la_OBJECTS)
src_nm_fortisslvpn_pppd_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -640,6 +641,7 @@ src_nm_fortisslvpn_service_LDADD = \
pppd_plugindir = $(PPPD_PLUGIN_DIR)
pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
+ shared/nm-utils/nm-shared-utils.c \
src/nm-fortisslvpn-pppd-plugin.c \
src/nm-ppp-status.h
@@ -649,7 +651,8 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
src/libnm-fortisslvpn-pppd-service-dbus.la \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
+ $(LIBNM_LIBS)
plugin_sources = \
properties/nm-fortisslvpn-editor-plugin.c \
@@ -977,6 +980,9 @@ src/src_libnm_fortisslvpn_pppd_service_dbus_la-nm-fortisslvpn-pppd-service-dbus.
src/libnm-fortisslvpn-pppd-service-dbus.la: $(src_libnm_fortisslvpn_pppd_service_dbus_la_OBJECTS) $(src_libnm_fortisslvpn_pppd_service_dbus_la_DEPENDENCIES) $(EXTRA_src_libnm_fortisslvpn_pppd_service_dbus_la_DEPENDENCIES) src/$(am__dirstamp)
$(AM_V_CCLD)$(LINK) $(src_libnm_fortisslvpn_pppd_service_dbus_la_OBJECTS) $(src_libnm_fortisslvpn_pppd_service_dbus_la_LIBADD) $(LIBS)
+shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo: \
+ shared/nm-utils/$(am__dirstamp) \
+ shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo: \
src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -1084,6 +1090,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@properties/$(DEPDIR)/properties_libnm_vpn_plugin_fortisslvpn_editor_la-nm-fortisslvpn-editor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@properties/$(DEPDIR)/properties_libnm_vpn_plugin_fortisslvpn_editor_la-resources.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/properties_libnm_vpn_plugin_fortisslvpn_core_la-nm-vpn-plugin-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_nm_fortisslvpn_service-nm-shared-utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libnm_fortisslvpn_pppd_service_dbus_la-nm-fortisslvpn-pppd-service-dbus.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.Plo@am__quote@
@@ -1169,6 +1176,13 @@ src/src_libnm_fortisslvpn_pppd_service_dbus_la-nm-fortisslvpn-pppd-service-dbus.
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_fortisslvpn_pppd_service_dbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libnm_fortisslvpn_pppd_service_dbus_la-nm-fortisslvpn-pppd-service-dbus.lo `test -f 'src/nm-fortisslvpn-pppd-service-dbus.c' || echo '$(srcdir)/'`src/nm-fortisslvpn-pppd-service-dbus.c
+shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.Tpo -c -o shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_nm_fortisslvpn_pppd_plugin_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+
src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo: src/nm-fortisslvpn-pppd-plugin.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo -MD -MP -MF src/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.Tpo -c -o src/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.lo `test -f 'src/nm-fortisslvpn-pppd-plugin.c' || echo '$(srcdir)/'`src/nm-fortisslvpn-pppd-plugin.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.Tpo src/$(DEPDIR)/src_nm_fortisslvpn_pppd_plugin_la-nm-fortisslvpn-pppd-plugin.Plo
@@ -1763,7 +1777,6 @@ src/nm-fortisslvpn-pppd-service-dbus.h: $(top_srcdir)/src/nm-fortisslvpn-pppd-se
src/nm-fortisslvpn-pppd-service-dbus.c: src/nm-fortisslvpn-pppd-service-dbus.h
@true
- $(LIBNM_LIBS)
###############################################################################
--
2.14.3