[network-manager-openvpn/nm-1-2] build: reorder entries in properties/Makefile.am

[Thomas Haller <thaller src gnome org>]

commit a6dccb84dc1251317d234b06c84061c7044636cf
Author: Thomas Haller <thaller redhat com>
Date:   Tue Apr 19 16:56:04 2016 +0200

    build: reorder entries in properties/Makefile.am
    
    (cherry picked from commit de8f1d4915c775bbdc2746de461bc5e1a0d23cce)

 properties/Makefile.am |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a24aa1e..2ba5284 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -14,12 +14,6 @@ plugin_sources = \
         import-export.c \
         import-export.h
 
-libnm_vpn_plugin_openvpn_la_SOURCES = \
-        $(plugin_sources)
-
-libnm_openvpn_properties_la_SOURCES = \
-        $(plugin_sources)
-
 uidir = $(datadir)/gnome-vpn-properties/openvpn
 ui_DATA = nm-openvpn-dialog.ui
 
@@ -32,37 +26,49 @@ common_CFLAGS =                                         \
         -DUIDIR=\""$(uidir)"\"                          \
         -DLOCALEDIR=\"$(datadir)/locale\"
 
+###############################################################################
+
+libnm_vpn_plugin_openvpn_la_SOURCES = \
+        $(plugin_sources)
+
 libnm_vpn_plugin_openvpn_la_CFLAGS =                    \
         $(common_CFLAGS)                                \
         $(LIBNM_CFLAGS)                                 \
         $(LIBNMA_CFLAGS)
 
-libnm_openvpn_properties_la_CFLAGS =                \
-        -DNM_OPENVPN_OLD \
-        $(common_CFLAGS)                                \
-        $(LIBNM_GLIB_CFLAGS)                            \
-        $(LIBNM_GTK_CFLAGS)
-
 libnm_vpn_plugin_openvpn_la_LIBADD =                    \
         $(GTK_LIBS)                                     \
         $(LIBNM_LIBS)                                   \
         $(LIBNMA_LIBS)                                  \
         $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
 
+libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+        -avoid-version \
+        -Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn.ver
+
+###############################################################################
+
+libnm_openvpn_properties_la_SOURCES = \
+        $(plugin_sources)
+
+libnm_openvpn_properties_la_CFLAGS =                \
+        -DNM_OPENVPN_OLD \
+        $(common_CFLAGS)                                \
+        $(LIBNM_GLIB_CFLAGS)                            \
+        $(LIBNM_GTK_CFLAGS)
+
 libnm_openvpn_properties_la_LIBADD =                \
         $(GTK_LIBS)                                     \
         $(LIBNM_GLIB_LIBS)                              \
         $(LIBNM_GTK_LIBS)                               \
         $(top_builddir)/shared/libnm-openvpn-shared.la
 
-libnm_vpn_plugin_openvpn_la_LDFLAGS = \
-        -avoid-version \
-        -Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn.ver
-
 libnm_openvpn_properties_la_LDFLAGS = \
         -avoid-version \
         -Wl,--version-script=$(srcdir)/libnm-openvpn-properties.ver
 
+###############################################################################
+
 libnm_vpn_plugin_openvpn_test_la_SOURCES = $(libnm_vpn_plugin_openvpn_la_SOURCES)
 libnm_vpn_plugin_openvpn_test_la_CFLAGS = $(libnm_vpn_plugin_openvpn_la_CFLAGS)
 libnm_vpn_plugin_openvpn_test_la_LIBADD = $(libnm_vpn_plugin_openvpn_la_LIBADD)
@@ -75,6 +81,8 @@ libnm_openvpn_properties_test_la_LIBADD = $(libnm_openvpn_properties_la_LIBADD)
 libnm_openvpn_properties_test_la_LDFLAGS = \
     -avoid-version
 
+###############################################################################
+
 noinst_LTLIBRARIES = \
     libnm-vpn-plugin-openvpn-test.la
 if WITH_LIBNM_GLIB