[network-manager-openvpn/th/vpn-editor-split-bgo765732: 2/15] build: reorder "shared/Makefile.am"

[Thomas Haller <thaller src gnome org>]

commit f323cfc98002df928ac555ed2492e2bbc795b659
Author: Thomas Haller <thaller redhat com>
Date:   Fri Apr 29 23:11:25 2016 +0200

    build: reorder "shared/Makefile.am"

 shared/Makefile.am |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/shared/Makefile.am b/shared/Makefile.am
index f9a7a5e..b427c63 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -3,31 +3,40 @@ if WITH_LIBNM_GLIB
 noinst_LTLIBRARIES += libnm-openvpn-shared.la
 endif
 
-libnm_vpn_plugin_openvpn_shared_la_CPPFLAGS = \
-    $(LIBNM_CFLAGS) \
-    -I$(top_srcdir)/shared
-
-libnm_openvpn_shared_la_CPPFLAGS = \
-    -DNM_OPENVPN_OLD \
-    $(LIBNM_GLIB_CFLAGS) \
-    -I$(top_srcdir)/shared
-
-libnm_vpn_plugin_openvpn_shared_la_SOURCES= \
+shared_sources = \
     nm-shared-utils.c \
     nm-shared-utils.h \
     utils.c \
     utils.h \
     nm-openvpn-service-defines.h
 
-libnm_openvpn_shared_la_SOURCES = \
-    $(libnm_vpn_plugin_openvpn_shared_la_SOURCES)
+###############################################################################
+
+libnm_vpn_plugin_openvpn_shared_la_CPPFLAGS = \
+    $(LIBNM_CFLAGS) \
+    -I$(top_srcdir)/shared
+
+libnm_vpn_plugin_openvpn_shared_la_SOURCES= \
+    $(shared_sources)
 
 libnm_vpn_plugin_openvpn_shared_la_LIBADD = \
     $(LIBNM_LIBS)
 
+###############################################################################
+
+libnm_openvpn_shared_la_SOURCES = \
+    $(shared_sources)
+
+libnm_openvpn_shared_la_CPPFLAGS = \
+    -DNM_OPENVPN_OLD \
+    $(LIBNM_GLIB_CFLAGS) \
+    -I$(top_srcdir)/shared
+
 libnm_openvpn_shared_la_LIBADD = \
     $(LIBNM_GLIB_LIBS)
 
+###############################################################################
+
 EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \