[network-manager-openconnect/th/vpn-editor-split-bgo767690: 5/14] build: cleanup Makefile.am for src and properties

[Thomas Haller <thaller src gnome org>]

commit 32bae26ccd657a99b8d4c50f5eb6f703bff53577
Author: Thomas Haller <thaller redhat com>
Date:   Tue Jun 14 18:30:17 2016 +0200

    build: cleanup Makefile.am for src and properties

 properties/Makefile.am |   58 ++++++++++++++++++++++++++++-------------------
 src/Makefile.am        |   11 ++++++--
 2 files changed, 42 insertions(+), 27 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 46e4cd2..5809f31 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -4,52 +4,62 @@ if WITH_LIBNM_GLIB
 plugin_LTLIBRARIES += libnm-openconnect-properties.la
 endif
 
-libnm_vpn_plugin_openconnect_la_SOURCES = \
+uidir = $(datadir)/gnome-vpn-properties/openconnect
+ui_DATA = nm-openconnect-dialog.ui
+
+plugin_sources = \
        auth-helpers.c \
        auth-helpers.h \
        nm-openconnect.c \
        nm-openconnect.h
+       $(NULL)
 
-libnm_openconnect_properties_la_SOURCES = \
-       $(libnm_vpn_plugin_openconnect_la_SOURCES)
+common_CFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(OPENCONNECT_CFLAGS) \
+       -I$(top_srcdir)/shared \
+       -I$(top_srcdir)/src \
+       -DICONDIR=\""$(datadir)/pixmaps"\" \
+       -DUIDIR=\""$(uidir)"\" \
+       -DLOCALEDIR=\"$(datadir)/locale\"
 
-uidir = $(datadir)/gnome-vpn-properties/openconnect
-ui_DATA = nm-openconnect-dialog.ui
+###############################################################################
 
-common_CFLAGS =                                         \
-       $(GLIB_CFLAGS)                                  \
-       $(GTK_CFLAGS)                                   \
-       $(OPENCONNECT_CFLAGS)                           \
-       -I$(top_srcdir)/shared                          \
-       -I$(top_srcdir)/src                             \
-       -DICONDIR=\""$(datadir)/pixmaps"\"              \
-       -DUIDIR=\""$(uidir)"\"                          \
-       -DLOCALEDIR=\"$(datadir)/locale\"
+libnm_vpn_plugin_openconnect_la_SOURCES = \
+       $(plugin_sources)
 
-libnm_vpn_plugin_openconnect_la_CFLAGS =                \
-       $(common_CFLAGS)                                \
+libnm_vpn_plugin_openconnect_la_CFLAGS = \
+       $(common_CFLAGS) \
        $(LIBNM_CFLAGS)
 
-libnm_openconnect_properties_la_CFLAGS =            \
-       -DNM_VPN_OLD \
-       $(common_CFLAGS)                                \
-       $(LIBNM_GLIB_CFLAGS)
-
 libnm_vpn_plugin_openconnect_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
        $(OPENCONNECT_LIBS)
 
+libnm_vpn_plugin_openconnect_la_LDFLAGS = \
+       -avoid-version
+
+###############################################################################
+
+libnm_openconnect_properties_la_SOURCES = \
+       $(plugin_sources)
+
+libnm_openconnect_properties_la_CFLAGS = \
+       -DNM_VPN_OLD \
+       $(common_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS)
+
 libnm_openconnect_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS) \
        $(OPENCONNECT_LIBS)
 
-libnm_vpn_plugin_openconnect_la_LDFLAGS = \
+libnm_openconnect_properties_la_LDFLAGS = \
        -avoid-version
 
-libnm_openconnect_properties_la_LDFLAGS = \
-       $(libnm_vpn_plugin_openconnect_la_LDFLAGS)
+###############################################################################
 
 CLEANFILES = *.bak *~
 
diff --git a/src/Makefile.am b/src/Makefile.am
index af31676..02fd140 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,7 @@
+libexec_PROGRAMS = \
+       nm-openconnect-service \
+       nm-openconnect-service-openconnect-helper
+
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBNM_CFLAGS) \
@@ -12,9 +16,7 @@ AM_CPPFLAGS = \
        -I"$(top_srcdir)"/shared \
        $(NULL)
 
-libexec_PROGRAMS = \
-       nm-openconnect-service \
-       nm-openconnect-service-openconnect-helper
+###############################################################################
 
 nm_openconnect_service_SOURCES = \
        nm-openconnect-service.c \
@@ -25,6 +27,7 @@ nm_openconnect_service_LDADD = \
        $(GLIB_LIBS) \
        $(LIBNM_LIBS)
 
+###############################################################################
 
 nm_openconnect_service_openconnect_helper_SOURCES = \
        nm-openconnect-service-openconnect-helper.c
@@ -33,4 +36,6 @@ nm_openconnect_service_openconnect_helper_LDADD = \
        $(GTHREAD_LIBS) \
        $(LIBNM_LIBS)
 
+###############################################################################
+
 CLEANFILES = *~