[network-manager-libreswan/th/vpn-editor-split-bgo766623: 6/18] build/properties: cleanup Makefile.am

[Thomas Haller <thaller src gnome org>]

commit 9684fbc8754b55258fc900db09f56297c94bd8c7
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 10 12:29:21 2016 +0200

    build/properties: cleanup Makefile.am

 properties/Makefile.am |   71 +++++++++++++++++++++++++++---------------------
 1 files changed, 40 insertions(+), 31 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index f368107..602fab3 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -4,49 +4,58 @@ if WITH_LIBNM_GLIB
 plugin_LTLIBRARIES += libnm-libreswan-properties.la
 endif
 
+plugin_sources = \
+    nm-libreswan.c \
+    nm-libreswan.h
+
 common_CFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -I"$(top_srcdir)/shared/" \
-       -DICONDIR=\""$(datadir)/pixmaps"\" \
-       -DUIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(datadir)/locale\"
+    $(GLIB_CFLAGS) \
+    $(GTK_CFLAGS) \
+    -I"$(top_srcdir)/shared/" \
+    -DICONDIR=\""$(datadir)/pixmaps"\" \
+    -DUIDIR=\""$(uidir)"\" \
+    -DLOCALEDIR=\"$(datadir)/locale\"
 
-libnm_vpn_plugin_libreswan_la_CFLAGS = \
-       $(common_CFLAGS) \
-       $(LIBNM_CFLAGS) \
-       $(LIBNMA_CFLAGS)
+###############################################################################
 
-libnm_libreswan_properties_la_CFLAGS = \
-       -DNM_VPN_OLD \
-       $(common_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(LIBNM_GTK_CFLAGS)
+libnm_vpn_plugin_libreswan_la_CFLAGS = \
+    $(common_CFLAGS) \
+    $(LIBNM_CFLAGS) \
+    $(LIBNMA_CFLAGS)
 
 libnm_vpn_plugin_libreswan_la_SOURCES = \
-       nm-libreswan.c \
-       nm-libreswan.h
-
-libnm_libreswan_properties_la_SOURCES = \
-       $(libnm_vpn_plugin_libreswan_la_SOURCES)
+    $(plugin_sources)
 
 libnm_vpn_plugin_libreswan_la_LIBADD = \
-       $(GTK_LIBS) \
-       $(LIBNM_LIBS) \
-       $(LIBNMA_LIBS) \
-       $(top_builddir)/shared/libnm-vpn-plugin-libreswan-shared.la
-
-libnm_libreswan_properties_la_LIBADD = \
-       $(GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS) \
-       $(LIBNM_GTK_LIBS) \
-       $(top_builddir)/shared/libnm-libreswan-shared.la
+    $(GTK_LIBS) \
+    $(LIBNM_LIBS) \
+    $(LIBNMA_LIBS) \
+    $(top_builddir)/shared/libnm-vpn-plugin-libreswan-shared.la
 
 libnm_vpn_plugin_libreswan_la_LDFLAGS = \
         -avoid-version
 
+###############################################################################
+
+libnm_libreswan_properties_la_CFLAGS = \
+    -DNM_VPN_OLD \
+    $(common_CFLAGS) \
+    $(LIBNM_GLIB_CFLAGS) \
+    $(LIBNM_GTK_CFLAGS)
+
+libnm_libreswan_properties_la_SOURCES = \
+    $(plugin_sources)
+
+libnm_libreswan_properties_la_LIBADD = \
+    $(GTK_LIBS) \
+    $(LIBNM_GLIB_LIBS) \
+    $(LIBNM_GTK_LIBS) \
+    $(top_builddir)/shared/libnm-libreswan-shared.la
+
 libnm_libreswan_properties_la_LDFLAGS = \
-       $(libnm_vpn_plugin_libreswan_la_LDFLAGS)
+    $(libnm_vpn_plugin_libreswan_la_LDFLAGS)
+
+###############################################################################
 
 uidir = $(datadir)/gnome-vpn-properties/libreswan
 ui_DATA = nm-libreswan-dialog.ui