[network-manager-pptp: 5/12] build: reorder src/Makefile.am

[Thomas Haller <thaller src gnome org>]

commit 5bc81841b9d675e44c06ad133ba56aab1d365991
Author: Thomas Haller <thaller redhat com>
Date:   Mon Sep 19 16:10:09 2016 +0200

    build: reorder src/Makefile.am

 src/Makefile.am |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 388b53a..4f3f536 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,11 @@
+libexec_PROGRAMS = nm-pptp-service
+
+noinst_LTLIBRARIES = libnm-pptp-pppd-service-dbus.la
+
+shared_sources = \
+    $(top_srcdir)/shared/nm-service-defines.h \
+    $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-macros.h
+
 AM_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     $(LIBNM_CFLAGS) \
@@ -12,17 +20,7 @@ AM_CPPFLAGS = \
     -DNM_PPTP_LOCALEDIR=\"$(datadir)/locale\" \
     -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
 
-libexec_PROGRAMS = nm-pptp-service
-
-nm_pptp_service_SOURCES = \
-    $(top_srcdir)/shared/nm-service-defines.h \
-    $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-macros.h \
-    nm-pptp-service.c \
-    nm-pptp-service.h
-
-
-# D-Bus stuff
-noinst_LTLIBRARIES = libnm-pptp-pppd-service-dbus.la
+###############################################################################
 
 nodist_libnm_pptp_pppd_service_dbus_la_SOURCES = \
     nm-pptp-pppd-service-dbus.c \
@@ -40,11 +38,20 @@ nm-pptp-pppd-service-dbus.h: $(top_srcdir)/src/nm-pptp-pppd-service.xml
 nm-pptp-pppd-service-dbus.c:
        @true
 
+###############################################################################
+
+nm_pptp_service_SOURCES = \
+    $(shared_sources) \
+    nm-pptp-service.c \
+    nm-pptp-service.h
+
 nm_pptp_service_LDADD = \
     $(GLIB_LIBS) \
     $(LIBNM_LIBS) \
     libnm-pptp-pppd-service-dbus.la
 
+###############################################################################
+
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pptp-pppd-plugin.la
 
@@ -63,9 +70,13 @@ nm_pptp_pppd_plugin_la_LIBADD = \
     $(GLIB_LIBS) \
     $(LIBNM_LIBS)
 
-BUILT_SOURCES = nm-pptp-pppd-service-dbus.h nm-pptp-pppd-service-dbus.c
+###############################################################################
 
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = \
+    nm-pptp-pppd-service-dbus.h \
+    nm-pptp-pppd-service-dbus.c
 
-EXTRA_DIST = nm-pptp-pppd-service.xml
+CLEANFILES = $(BUILT_SOURCES)
 
+EXTRA_DIST = \
+    nm-pptp-pppd-service.xml