[network-manager-pptp/th/vpn-editor-split-bgo766623: 9/21] build: cleanup Makefile.am

[Thomas Haller <thaller src gnome org>]

commit 76d580ab99a4bc77261c306a754853460f17c80e
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 18 14:35:34 2016 +0200

    build: cleanup Makefile.am
    
    Also unify indention and whitespace. This brings a lot of line-churn,
    but with the following addition of "shared/" directory and GTK plugin
    split, the makefiles anyway completely change with respect to previous.
    
    So, lets get the style right for once. Also, make the files more
    similar to what we have in other VPN plugins.

 auth-dialog/Makefile.am |   30 +++++++-------
 properties/Makefile.am  |   99 +++++++++++++++++++++++++---------------------
 src/Makefile.am         |   54 +++++++++++++-------------
 3 files changed, 96 insertions(+), 87 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 4508752..8ed8ed6 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -1,23 +1,23 @@
 libexec_PROGRAMS = nm-pptp-auth-dialog
 
-nm_pptp_auth_dialog_CPPFLAGS =                 \
-       $(LIBNM_CFLAGS)                         \
-       $(GLIB_CFLAGS)                          \
-       $(GTK_CFLAGS)                           \
-       $(LIBNMA_CFLAGS)                        \
-       $(LIBSECRET_CFLAGS)                     \
-       -I${top_srcdir}                         \
-       -DICONDIR=\""$(datadir)/pixmaps"\"      \
-       -DUIDIR=\""$(uidir)"\"                  \
-       -DBINDIR=\""$(bindir)"\"
+nm_pptp_auth_dialog_CPPFLAGS = \
+    $(LIBNM_CFLAGS) \
+    $(GLIB_CFLAGS) \
+    $(GTK_CFLAGS) \
+    $(LIBNMA_CFLAGS) \
+    $(LIBSECRET_CFLAGS) \
+    -I${top_srcdir} \
+    -DICONDIR=\""$(datadir)/pixmaps"\" \
+    -DUIDIR=\""$(uidir)"\" \
+    -DBINDIR=\""$(bindir)"\"
 
 nm_pptp_auth_dialog_SOURCES = \
-       main.c
+    main.c
 
 nm_pptp_auth_dialog_LDADD = \
-       $(LIBNM_LIBS) \
-       $(GTK_LIBS) \
-       $(LIBNMA_LIBS) \
-       $(LIBSECRET_LIBS)
+    $(LIBNM_LIBS) \
+    $(GTK_LIBS) \
+    $(LIBNMA_LIBS) \
+    $(LIBSECRET_LIBS)
 
 CLEANFILES = *~
diff --git a/properties/Makefile.am b/properties/Makefile.am
index cf501db..b9862ef 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -6,56 +6,65 @@ endif
 
 AM_CPPFLAGS = -I${top_srcdir}
 
+plugin_sources = \
+    nm-pptp.c \
+    nm-pptp.h \
+    advanced-dialog.c \
+    advanced-dialog.h \
+    import-export.c \
+    import-export.h
+
+uidir = $(datadir)/gnome-vpn-properties/pptp
+ui_DATA = nm-pptp-dialog.ui
+
+common_CFLAGS = \
+    $(GLIB_CFLAGS) \
+    $(GTK_CFLAGS) \
+    -I$(top_srcdir)/src \
+    -DICONDIR=\""$(datadir)/pixmaps"\" \
+    -DUIDIR=\""$(uidir)"\" \
+    -DLOCALEDIR=\""$(datadir)/locale"\"
+
+###############################################################################
+
 libnm_vpn_plugin_pptp_la_SOURCES = \
-       nm-pptp.c \
-       nm-pptp.h \
-       advanced-dialog.c \
-       advanced-dialog.h \
-       import-export.c \
-       import-export.h
+    $(plugin_sources)
+
+libnm_vpn_plugin_pptp_la_CFLAGS = \
+    $(common_CFLAGS) \
+    $(LIBNMA_CFLAGS) \
+    $(LIBNM_CFLAGS)
+
+libnm_vpn_plugin_pptp_la_LIBADD = \
+    $(GTK_LIBS) \
+    $(LIBNMA_LIBS) \
+    $(LIBNM_LIBS)
+
+libnm_vpn_plugin_pptp_la_LDFLAGS = \
+    -avoid-version
+
+###############################################################################
 
 libnm_pptp_properties_la_SOURCES = \
-       $(libnm_vpn_plugin_pptp_la_SOURCES)
+    $(plugin_sources)
 
-uidir = $(datadir)/gnome-vpn-properties/pptp
-ui_DATA = nm-pptp-dialog.ui
+libnm_pptp_properties_la_CFLAGS = \
+    -DNM_VPN_OLD \
+    $(common_CFLAGS) \
+    $(LIBNM_GLIB_CFLAGS) \
+    $(LIBNM_GTK_CFLAGS)
+
+libnm_pptp_properties_la_LIBADD = \
+    $(GTK_LIBS) \
+    $(LIBNM_GLIB_LIBS) \
+    $(LIBNM_GTK_LIBS)
+
+libnm_pptp_properties_la_LDFLAGS = \
+    -avoid-version
 
-common_CFLAGS =                                         \
-        $(GLIB_CFLAGS)                                  \
-        $(GTK_CFLAGS)                                   \
-        -I$(top_srcdir)/src                             \
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
-        -DUIDIR=\""$(uidir)"\"                          \
-        -DLOCALEDIR=\""$(datadir)/locale"\"
-
-libnm_vpn_plugin_pptp_la_CFLAGS =                       \
-        $(common_CFLAGS)                                \
-        $(LIBNMA_CFLAGS)                                \
-        $(LIBNM_CFLAGS)
-
-libnm_pptp_properties_la_CFLAGS =                       \
-        -DNM_VPN_OLD                                    \
-        $(common_CFLAGS)                                \
-        $(LIBNM_GLIB_CFLAGS)                            \
-        $(LIBNM_GTK_CFLAGS)
-
-libnm_vpn_plugin_pptp_la_LIBADD =                       \
-        $(GTK_LIBS)                                     \
-        $(LIBNMA_LIBS)                                  \
-        $(LIBNM_LIBS)
-
-libnm_pptp_properties_la_LIBADD =                       \
-        $(GTK_LIBS)                                     \
-        $(LIBNM_GLIB_LIBS)                              \
-        $(LIBNM_GTK_LIBS)
-
-libnm_vpn_plugin_pptp_la_LDFLAGS =                      \
-        -avoid-version
-
-libnm_pptp_properties_la_LDFLAGS =   \
-        $(libnm_vpn_plugin_pptp_la_LDFLAGS)
+###############################################################################
 
 CLEANFILES = *.bak *~
 
-EXTRA_DIST =                            \
-        $(ui_DATA)
+EXTRA_DIST = \
+    $(ui_DATA)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ac4de9..09e128b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,31 @@
-AM_CPPFLAGS =                                                  \
-       $(GLIB_CFLAGS)                                          \
-       $(LIBNM_CFLAGS)                                         \
-       -I${top_srcdir}                                         \
-       -DBINDIR=\"$(bindir)\"                                  \
-       -DPREFIX=\""$(prefix)"\"                                \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
-       -DLIBDIR=\""$(libdir)"\"                                \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
-       -DLOCALSTATEDIR=\""$(localstatedir)"\"                  \
-       -DDATADIR=\"$(datadir)\"                                \
-       -DNM_PPTP_LOCALEDIR=\"$(datadir)/locale\"               \
-       -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" 
+AM_CPPFLAGS = \
+    $(GLIB_CFLAGS) \
+    $(LIBNM_CFLAGS) \
+    -I${top_srcdir} \
+    -DBINDIR=\"$(bindir)\" \
+    -DPREFIX=\""$(prefix)"\" \
+    -DSYSCONFDIR=\""$(sysconfdir)"\" \
+    -DLIBDIR=\""$(libdir)"\" \
+    -DLIBEXECDIR=\""$(libexecdir)"\" \
+    -DLOCALSTATEDIR=\""$(localstatedir)"\" \
+    -DDATADIR=\"$(datadir)\" \
+    -DNM_PPTP_LOCALEDIR=\"$(datadir)/locale\" \
+    -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
 
 libexec_PROGRAMS = nm-pptp-service
 
 nm_pptp_service_SOURCES = \
-       nm-pptp-service-defines.h \
-       nm-pptp-service.c \
-       nm-pptp-service.h
+    nm-pptp-service-defines.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 \
-       nm-pptp-pppd-service-dbus.h
+    nm-pptp-pppd-service-dbus.c \
+    nm-pptp-pppd-service-dbus.h
 
 libnm_pptp_pppd_service_dbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS))
 
@@ -40,26 +40,26 @@ nm-pptp-pppd-service-dbus.c:
        @true
 
 nm_pptp_service_LDADD = \
-       $(GLIB_LIBS) \
-       $(LIBNM_LIBS) \
-       libnm-pptp-pppd-service-dbus.la
+    $(GLIB_LIBS) \
+    $(LIBNM_LIBS) \
+    libnm-pptp-pppd-service-dbus.la
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pptp-pppd-plugin.la
 
 nm_pptp_pppd_plugin_la_SOURCES = \
-       nm-pptp-pppd-plugin.c \
-       nm-ppp-status.h
+    nm-pptp-pppd-plugin.c \
+    nm-ppp-status.h
 
 nm_pptp_pppd_plugin_la_CPPFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(LIBNM_CFLAGS)
+    $(GLIB_CFLAGS) \
+    $(LIBNM_CFLAGS)
 
 nm_pptp_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pptp_pppd_plugin_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(LIBNM_LIBS)
+    $(GLIB_LIBS) \
+    $(LIBNM_LIBS)
 
 BUILT_SOURCES = nm-pptp-pppd-service-dbus.h nm-pptp-pppd-service-dbus.c