[network-manager-openvpn: 4/14] build: merge shared/Makefile.am in top-level Makefile.am

[Thomas Haller <thaller src gnome org>]

commit 6c8445bc34beba507b320b0b0094ecb9fed27d0a
Author: Thomas Haller <thaller redhat com>
Date:   Sun Feb 12 09:46:25 2017 +0100

    build: merge shared/Makefile.am in top-level Makefile.am

 Makefile.am        |   19 +++++++++++++++++--
 configure.ac       |    1 -
 shared/Makefile.am |   13 -------------
 3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 46d1116..b8811d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
+EXTRA_DIST =
+
 SUBDIRS = \
-       shared \
        src \
        properties \
        po
@@ -44,10 +45,24 @@ nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
            -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR_NAME_FILE@|g' \
            $^ >$@
 
+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-test-utils.h \
+       shared/nm-default.h \
+       shared/nm-service-defines.h \
+       shared/utils.c \
+       shared/utils.h \
+       $(NULL)
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-more-warnings=yes
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        nm-openvpn-service.name.in \
        $(dbusservice_DATA) \
        $(appdata_in_files) \
diff --git a/configure.ac b/configure.ac
index ff76a4f..5f5153f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,6 @@ properties/Makefile
 properties/tests/Makefile
 properties/tests/conf/Makefile
 po/Makefile.in
-shared/Makefile
 ])
 AC_OUTPUT