[network-manager-libreswan: 3/11] build: merge shared/Makefile.am in toplevel makefile

[Thomas Haller <thaller src gnome org>]

commit 6c461578de364605c8410c12bb3213f1477d46b9
Author: Thomas Haller <thaller redhat com>
Date:   Fri Feb 24 16:53:31 2017 +0100

    build: merge shared/Makefile.am in toplevel makefile

 Makefile.am        |   21 ++++++++++++++++++++-
 configure.ac       |    1 -
 shared/Makefile.am |   15 ---------------
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8fc521d..ffb5139 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
-       shared \
        properties \
        src \
        po
@@ -28,6 +27,26 @@ dbusservice_DATA = nm-libreswan-service.conf
 nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-libreswan-service.name
 
+###############################################################################
+
+EXTRA_DIST += \
+       shared/README \
+       shared/nm-utils/gsystem-local-alloc.h \
+       shared/nm-utils/nm-glib.h \
+       shared/nm-utils/nm-macros-internal.h \
+       shared/nm-utils/nm-shared-utils.c \
+       shared/nm-utils/nm-shared-utils.h \
+       shared/nm-utils/nm-vpn-plugin-utils.c \
+       shared/nm-utils/nm-vpn-plugin-utils.h \
+       shared/nm-utils/nm-vpn-plugin-macros.h \
+       shared/nm-default.h \
+       shared/nm-service-defines.h \
+       shared/utils.c \
+       shared/utils.h \
+       $(NULL)
+
+###############################################################################
+
 if WITH_LIBNM_GLIB
 # Install a file with full path to plugins for an old gnome-shell
 # https://bugzilla.gnome.org/show_bug.cgi?id=693590
diff --git a/configure.ac b/configure.ac
index 804963f..8f768b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,6 @@ src/Makefile
 auth-dialog/Makefile
 properties/Makefile
 po/Makefile.in
-shared/Makefile
 ])
 AC_OUTPUT