[network-manager-fortisslvpn/th/gtk-split-and-log-bgo771544: 21/25] src: cleanup src/Makefile.am

[Thomas Haller <thaller src gnome org>]

commit e9a43a9a2978a75198b62e9beb3db25c677d1a9d
Author: Thomas Haller <thaller redhat com>
Date:   Fri Sep 16 16:37:55 2016 +0200

    src: cleanup src/Makefile.am
    
    Just move things that are related closer to each other.

 src/Makefile.am |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e820797..f017ef2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
 
-install-data-hook:
-       $(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
+libexec_PROGRAMS = nm-fortisslvpn-service
+
+noinst_LTLIBRARIES = libnm-fortisslvpn-pppd-service-dbus.la
 
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
@@ -12,15 +13,7 @@ AM_CPPFLAGS = \
        -DNM_FORTISSLVPN_STATEDIR=\"$(fortisslvpn_statedir)\" \
        -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
 
-libexec_PROGRAMS = nm-fortisslvpn-service
-
-nm_fortisslvpn_service_SOURCES = \
-       $(top_srcdir)/shared/nm-service-defines.h \
-       nm-fortisslvpn-service.c \
-       nm-fortisslvpn-service.h
-
-# D-Bus stuff
-noinst_LTLIBRARIES = libnm-fortisslvpn-pppd-service-dbus.la
+###############################################################################
 
 nodist_libnm_fortisslvpn_pppd_service_dbus_la_SOURCES = \
        nm-fortisslvpn-pppd-service-dbus.c \
@@ -38,11 +31,20 @@ nm-fortisslvpn-pppd-service-dbus.h: $(top_srcdir)/src/nm-fortisslvpn-pppd-servic
 nm-fortisslvpn-pppd-service-dbus.c:
        @true
 
+###############################################################################
+
+nm_fortisslvpn_service_SOURCES = \
+       $(top_srcdir)/shared/nm-service-defines.h \
+       nm-fortisslvpn-service.c \
+       nm-fortisslvpn-service.h
+
 nm_fortisslvpn_service_LDADD = \
        $(GLIB_LIBS) \
        $(LIBNM_LIBS) \
        libnm-fortisslvpn-pppd-service-dbus.la
 
+###############################################################################
+
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-fortisslvpn-pppd-plugin.la
 
@@ -57,15 +59,24 @@ nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = \
        "-I$(top_srcdir)/shared/" \
        $(NULL)
 
-nm_fortisslvpn_pppd_plugin_la_LDFLAGS = -module -avoid-version
+nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
+       -module -avoid-version
 
 nm_fortisslvpn_pppd_plugin_la_LIBADD = \
        $(GLIB_LIBS) \
        $(LIBNM_LIBS) \
        libnm-fortisslvpn-pppd-service-dbus.la
 
-BUILT_SOURCES = nm-fortisslvpn-pppd-service-dbus.h nm-fortisslvpn-pppd-service-dbus.c
+###############################################################################
+
+install-data-hook:
+       $(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
+
+BUILT_SOURCES = \
+       nm-fortisslvpn-pppd-service-dbus.h \
+       nm-fortisslvpn-pppd-service-dbus.c
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = nm-fortisslvpn-pppd-service.xml
+EXTRA_DIST = \
+       nm-fortisslvpn-pppd-service.xml