[gnome-builder] build: beautify all makefiles the same



commit b5e0e936718e5004e08f2dfb2f00c01b19ad528e
Author: Christian Hergert <chergert redhat com>
Date:   Fri Feb 24 13:29:12 2017 -0800

    build: beautify all makefiles the same
    
    We had a bunch of mismatched whitespace alignment. Not really a stickler
    for this, but since we had some done and writing a script to do it is
    rather easy, we might as well just run it across everything.

 Makefile.am                                        |  158 ++--
 build/Makefile.am                                  |   20 +-
 build/autotools/Makefile.am                        |   42 +-
 build/autotools/align_makefile.py                  |   54 +
 contrib/Makefile.am                                |   22 +-
 contrib/egg/Makefile.am                            |  148 ++--
 contrib/gd/Makefile.am                             |    8 +-
 contrib/gstyle/Makefile.am                         |  216 ++--
 contrib/gstyle/tests/Makefile.am                   |   48 +-
 contrib/jsonrpc-glib/Makefile.am                   |   44 +-
 contrib/libeditorconfig/Makefile.am                |   54 +-
 contrib/nautilus/Makefile.am                       |   18 +-
 contrib/pnl/Makefile.am                            |  114 +-
 contrib/rg/Makefile.am                             |   56 +-
 contrib/search/Makefile.am                         |   24 +-
 contrib/tmpl/Makefile.am                           |  190 ++--
 contrib/xml/Makefile.am                            |   14 +-
 data/Makefile.am                                   |   32 +-
 data/fonts/Makefile.am                             |    2 +-
 data/gsettings/Makefile.am                         |   20 +-
 data/icons/Makefile.am                             |   26 +-
 data/icons/hicolor/Makefile.am                     |    2 +-
 data/style-schemes/Makefile.am                     |    4 +-
 doc/Makefile.am                                    |   74 +-
 doc/examples/Makefile.am                           |    2 +-
 help/Makefile.am                                   |    6 +-
 libide/Makefile.am                                 | 1292 ++++++++++----------
 plugins/Makefile.am                                |   84 +-
 plugins/autotools-templates/Makefile.am            |   88 +-
 .../autotools_templates/resources/Makefile.am      |   58 +-
 plugins/autotools/Makefile.am                      |   36 +-
 plugins/beautifier/Makefile.am                     |   62 +-
 plugins/c-pack/Makefile.am                         |   12 +-
 plugins/cargo/Makefile.am                          |    2 +-
 plugins/clang/Makefile.am                          |   46 +-
 plugins/color-picker/Makefile.am                   |   52 +-
 plugins/command-bar/Makefile.am                    |   42 +-
 plugins/comment-code/Makefile.am                   |   10 +-
 plugins/create-project/Makefile.am                 |   22 +-
 plugins/ctags/Makefile.am                          |   44 +-
 plugins/devhelp/Makefile.am                        |   20 +-
 plugins/file-search/Makefile.am                    |   10 +-
 plugins/flatpak/Makefile.am                        |   60 +-
 plugins/gcc/Makefile.am                            |    2 +-
 plugins/gettext/Makefile.am                        |    4 +-
 plugins/git/Makefile.am                            |   32 +-
 plugins/gnome-code-assistance/Makefile.am          |   26 +-
 plugins/html-preview/Makefile.am                   |    4 +-
 plugins/jedi/Makefile.am                           |    2 +-
 plugins/jhbuild/Makefile.am                        |    2 +-
 plugins/meson-templates/Makefile.am                |   10 +-
 plugins/mingw/Makefile.am                          |    8 +-
 plugins/project-tree/Makefile.am                   |   44 +-
 plugins/python-gi-imports-completion/Makefile.am   |    2 +-
 plugins/python-pack/Makefile.am                    |    8 +-
 plugins/quick-highlight/Makefile.am                |    8 +-
 plugins/rust-langserv/Makefile.am                  |    2 +-
 plugins/rustup/Makefile.am                         |    2 +-
 plugins/support/Makefile.am                        |   12 +-
 plugins/symbol-tree/Makefile.am                    |   16 +-
 plugins/sysmon/Makefile.am                         |   10 +-
 plugins/sysprof/Makefile.am                        |   10 +-
 plugins/terminal/Makefile.am                       |   48 +-
 plugins/vala-pack/Makefile.am                      |  112 +-
 plugins/xml-pack/Makefile.am                       |   62 +-
 src/Makefile.am                                    |   42 +-
 tests/Makefile.am                                  |  152 ++--
 67 files changed, 2006 insertions(+), 1952 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0529446..54befd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,59 +2,59 @@ SUBDIRS = . build contrib data libide src plugins tools po tests doc help
 
 ACLOCAL_AMFLAGS = -I build/autotools
 
-EXTRA_DIST = \
-       AUTHORS \
+EXTRA_DIST =                                                                 \
+       AUTHORS                                                              \
        $(NULL)
 
 # --disable-gtk-doc until future notice
-DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-introspection \
-       --disable-gtk-doc \
-       --disable-tracing \
-       --enable-appstream-util \
-       --disable-maintainer-mode \
+DISTCHECK_CONFIGURE_FLAGS =                                                  \
+       --enable-introspection                                               \
+       --disable-gtk-doc                                                    \
+       --disable-tracing                                                    \
+       --enable-appstream-util                                              \
+       --disable-maintainer-mode                                            \
        $(NULL)
 
-GITIGNOREFILES = \
-       **/*.swp \
-       .flatpak-builder \
-       *.o \
-       aclocal.m4 \
-       build-aux \
-       ChangeLog \
-       config \
-       config.h.in \
-       gtk-doc.m4 \
-       gtk-doc.make \
-       INSTALL \
-       ABOUT-NLS \
+GITIGNOREFILES =                                                             \
+       **/*.swp                                                             \
+       .flatpak-builder                                                     \
+       *.o                                                                  \
+       aclocal.m4                                                           \
+       build-aux                                                            \
+       ChangeLog                                                            \
+       config                                                               \
+       config.h.in                                                          \
+       gtk-doc.m4                                                           \
+       gtk-doc.make                                                         \
+       INSTALL                                                              \
+       ABOUT-NLS                                                            \
        $(NULL)
 
 AUTHORS:
-       @if test -d "$(srcdir)/.git"; \
-       then \
-               echo Creating $@ && \
-               ( cd "$(top_srcdir)" && \
-                 echo '# Generated by Makefile. Do not edit.'; echo; \
+       @if test -d "$(srcdir)/.git";                                        \
+       then                                                                 \
+               echo Creating $@ &&                                          \
+               ( cd "$(top_srcdir)" &&                                      \
+                 echo '# Generated by Makefile. Do not edit.'; echo;          \
                  git log --no-merges --pretty=format:"%an" libide src plugins \
-                 | sort | uniq ) > $@.tmp \
-               && mv -f $@.tmp $@ \
-               || ( rm -f $@.tmp ; \
-                    echo Failed to generate $@ >&2 ); \
+                 | sort | uniq ) > $@.tmp                                     \
+               && mv -f $@.tmp $@                                           \
+               || ( rm -f $@.tmp ;                                          \
+                    echo Failed to generate $@ >&2 );                            \
        fi
 
 dist-hook:
-       @if test -d "$(srcdir)/.git"; \
-       then \
-               echo Creating ChangeLog && \
-               ( cd "$(top_srcdir)" && \
-                 echo '# Generated by Makefile. Do not edit.'; echo; \
+       @if test -d "$(srcdir)/.git";                                        \
+       then                                                                 \
+               echo Creating ChangeLog &&                                   \
+               ( cd "$(top_srcdir)" &&                                      \
+                 echo '# Generated by Makefile. Do not edit.'; echo;          \
                  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
-               && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-               || ( rm -f ChangeLog.tmp ; \
-                    echo Failed to generate ChangeLog >&2 ); \
-       else \
-               echo A git clone is required to generate a ChangeLog >&2; \
+               && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog              \
+               || ( rm -f ChangeLog.tmp ;                                   \
+                    echo Failed to generate ChangeLog >&2 );                     \
+       else                                                                 \
+               echo A git clone is required to generate a ChangeLog >&2;    \
        fi
 
 .PHONY: AUTHORS
@@ -62,54 +62,54 @@ dist-hook:
 RUNTIME_TYPELIB_PATH = libide:contrib/egg:contrib/pnl:contrib/tmpl:$(GI_TYPELIB_PATH)
 
 run:
-       LSAN_OPTIONS=suppressions=$(top_srcdir)/build/asan.supp \
-       ASAN_OPTIONS=alloc_dealloc_mismatch=0 \
-       PEAS_DEBUG=1 \
-       GB_IN_TREE_PLUGINS=1 \
-       GB_IN_TREE_FONTS=1 \
-       GB_IN_TREE_STYLE_SCHEMES=1 \
-       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)" \
-       GOBJECT_DEBUG=instance-count \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PATH=$(top_builddir)/src:${PATH} \
+       LSAN_OPTIONS=suppressions=$(top_srcdir)/build/asan.supp              \
+       ASAN_OPTIONS=alloc_dealloc_mismatch=0                                \
+       PEAS_DEBUG=1                                                         \
+       GB_IN_TREE_PLUGINS=1                                                 \
+       GB_IN_TREE_FONTS=1                                                   \
+       GB_IN_TREE_STYLE_SCHEMES=1                                           \
+       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)"                            \
+       GOBJECT_DEBUG=instance-count                                         \
+       PYTHONDONTWRITEBYTECODE=yes                                          \
+       PATH=$(top_builddir)/src:${PATH}                                     \
        $(LIBTOOL) --mode=execute gdb -ex run --args src/gnome-builder -vvvv -s $(ARGS)
 
 strace:
-       PEAS_DEBUG=1 \
-       GB_IN_TREE_PLUGINS=1 \
-       GB_IN_TREE_FONTS=1 \
-       GB_IN_TREE_STYLE_SCHEMES=1 \
-       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)" \
-       GOBJECT_DEBUG=instance-count \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PATH=$(top_builddir)/src:${PATH} \
+       PEAS_DEBUG=1                                                         \
+       GB_IN_TREE_PLUGINS=1                                                 \
+       GB_IN_TREE_FONTS=1                                                   \
+       GB_IN_TREE_STYLE_SCHEMES=1                                           \
+       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)"                            \
+       GOBJECT_DEBUG=instance-count                                         \
+       PYTHONDONTWRITEBYTECODE=yes                                          \
+       PATH=$(top_builddir)/src:${PATH}                                     \
        $(LIBTOOL) --mode=execute strace -T src/gnome-builder -vvvv -s $(ARGS)
 
 debug:
-       LSAN_OPTIONS=suppressions=$(top_srcdir)/build/asan.supp \
-       ASAN_OPTIONS=alloc_dealloc_mismatch=0 \
-       G_SLICE=always-malloc \
-       PEAS_DEBUG=1 \
-       GB_IN_TREE_PLUGINS=1 \
-       GB_IN_TREE_FONTS=1 \
-       GB_IN_TREE_STYLE_SCHEMES=1 \
-       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)" \
-       G_DEBUG=fatal-criticals \
-       GOBJECT_DEBUG=instance-count \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PATH=$(top_builddir)/src:${PATH} \
+       LSAN_OPTIONS=suppressions=$(top_srcdir)/build/asan.supp              \
+       ASAN_OPTIONS=alloc_dealloc_mismatch=0                                \
+       G_SLICE=always-malloc                                                \
+       PEAS_DEBUG=1                                                         \
+       GB_IN_TREE_PLUGINS=1                                                 \
+       GB_IN_TREE_FONTS=1                                                   \
+       GB_IN_TREE_STYLE_SCHEMES=1                                           \
+       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)"                            \
+       G_DEBUG=fatal-criticals                                              \
+       GOBJECT_DEBUG=instance-count                                         \
+       PYTHONDONTWRITEBYTECODE=yes                                          \
+       PATH=$(top_builddir)/src:${PATH}                                     \
        $(LIBTOOL) --mode=execute gdb -ex run --args src/gnome-builder -vvvv -s $(ARGS)
 
 valgrind:
-       PEAS_DEBUG=1 \
-       GB_IN_TREE_PLUGINS=1 \
-       GB_IN_TREE_FONTS=1 \
-       GB_IN_TREE_STYLE_SCHEMES=1 \
-       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)" \
-       G_DEBUG=fatal-criticals \
-       G_SLICE=always-malloc \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PATH=$(top_builddir)/src:${PATH} \
+       PEAS_DEBUG=1                                                         \
+       GB_IN_TREE_PLUGINS=1                                                 \
+       GB_IN_TREE_FONTS=1                                                   \
+       GB_IN_TREE_STYLE_SCHEMES=1                                           \
+       GI_TYPELIB_PATH="$(RUNTIME_TYPELIB_PATH)"                            \
+       G_DEBUG=fatal-criticals                                              \
+       G_SLICE=always-malloc                                                \
+       PYTHONDONTWRITEBYTECODE=yes                                          \
+       PATH=$(top_builddir)/src:${PATH}                                     \
        $(LIBTOOL) --mode=execute valgrind src/gnome-builder -vvvv -s $(ARGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/Makefile.am b/build/Makefile.am
index 1814f27..6a06547 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -2,18 +2,18 @@ SUBDIRS = autotools
 
 EXTRA_DIST = asan.supp
 
-GITIGNOREFILES = \
-       compile \
+GITIGNOREFILES =     \
+       compile      \
        config.guess \
        config.rpath \
-       config.sub \
-       depcomp \
-       install-sh \
-       ltmain.sh \
-       missing \
-       py-compile \
-       test-driver \
-       ylwrap \
+       config.sub   \
+       depcomp      \
+       install-sh   \
+       ltmain.sh    \
+       missing      \
+       py-compile   \
+       test-driver  \
+       ylwrap       \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index 399a77c..de293f0 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -1,28 +1,28 @@
-EXTRA_DIST = \
-       Makefile.am.enums \
-       Makefile.am.gresources \
-       Makefile.am.marshal \
-       appstream-xml.m4 \
-       ax_append_compile_flags.m4 \
-       ax_append_flag.m4 \
-       ax_check_compile_flag.m4 \
-       ax_check_link_flag.m4 \
-       ax_compiler_vendor.m4 \
-       ax_cxx_compile_stdcxx.m4 \
-       ax_cxx_compile_stdcxx_11.m4 \
-       ax_require_defined.m4 \
-       gb_enable_rdtscp.m4 \
-       introspection.m4 \
-       pkg.m4 \
-       vala.m4 \
-       vapigen.m4 \
-       yelp.m4 \
-       tap-test \
+EXTRA_DIST =                                         \
+       Makefile.am.enums                            \
+       Makefile.am.gresources                       \
+       Makefile.am.marshal                          \
+       appstream-xml.m4                             \
+       ax_append_compile_flags.m4                   \
+       ax_append_flag.m4                            \
+       ax_check_compile_flag.m4                     \
+       ax_check_link_flag.m4                        \
+       ax_compiler_vendor.m4                        \
+       ax_cxx_compile_stdcxx.m4                     \
+       ax_cxx_compile_stdcxx_11.m4                  \
+       ax_require_defined.m4                        \
+       gb_enable_rdtscp.m4                          \
+       introspection.m4                             \
+       pkg.m4                                       \
+       vala.m4                                      \
+       vapigen.m4                                   \
+       yelp.m4                                      \
+       tap-test                                     \
        $(NULL)
 
 # We want to ignore all m4 files except a few
 # we explicitly keep in repo
-GITIGNOREFILES = \
+GITIGNOREFILES =                                     \
        $(filter-out $(EXTRA_DIST),$(wildcard *.m4)) \
        $(NULL)
 
diff --git a/build/autotools/align_makefile.py b/build/autotools/align_makefile.py
new file mode 100755
index 0000000..2fcabe9
--- /dev/null
+++ b/build/autotools/align_makefile.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+
+"""
+For every line in the makefile ending in a backslash, locate the longest
+line and then reformat all lines to match the proper tailing whitespace.
+"""
+
+import os
+import sys
+
+filenames = sys.argv[1:]
+
+def count_prefix_tabs(line):
+    count = 0
+    for ch in line:
+        if ch == '\t':
+            count += 1
+        else:
+            break
+    return count
+
+def count_visual_chars(line):
+    n_tabs = count_prefix_tabs(line)
+    return n_tabs * 8 + len(line.strip())
+
+for path in filenames:
+    lines = None
+    longest = 0
+
+    # find the longest line, stripping the prefix \t (which will be
+    # rewritten) and the trailing space before the \\.
+    with open(path, 'r') as stream:
+        lines = list(stream.readlines())
+        for line in lines:
+            if line.endswith('\\\n'):
+                line = line[:-2].rstrip()
+                length = count_visual_chars(line)
+                longest = max(longest, length)
+
+    # Now rewrite the file with the line modifications
+    with open(path + '.tmp', 'w') as stream:
+        for line in lines:
+            if not line.endswith('\\\n'):
+                stream.write(line)
+                continue
+
+            line = line[:-2].rstrip()
+            short = count_visual_chars(line)
+
+            line = line + (longest - short) * ' ' + ' \\\n'
+            stream.write(line)
+
+    os.rename(path + '.tmp', path)
+
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 9d94127..201cc96 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,15 +1,15 @@
-SUBDIRS = \
-       egg \
-       gd \
+SUBDIRS =               \
+       egg             \
+       gd              \
        libeditorconfig \
-       jsonrpc-glib \
-       nautilus \
-       pnl \
-       rg \
-       search \
-       gstyle \
-       tmpl \
-       xml \
+       jsonrpc-glib    \
+       nautilus        \
+       pnl             \
+       rg              \
+       search          \
+       gstyle          \
+       tmpl            \
+       xml             \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/egg/Makefile.am b/contrib/egg/Makefile.am
index 4aee7a4..cb8dcc4 100644
--- a/contrib/egg/Makefile.am
+++ b/contrib/egg/Makefile.am
@@ -7,77 +7,77 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libegg-private.la
 
 headersdir = $(includedir)/gnome-builder-@VERSION@/egg
-headers_DATA = \
-       egg-animation.h \
-       egg-binding-group.h \
-       egg-box.h \
-       egg-centering-bin.h \
-       egg-column-layout.h \
-       egg-counter.h \
-       egg-date-time.h \
-       egg-empty-state.h \
-       egg-entry-box.h \
-       egg-file-chooser-entry.h \
-       egg-frame-source.h \
-       egg-heap.h \
-       egg-list-box.h \
-       egg-menu-manager.h \
-       egg-pill-box.h \
-       egg-priority-box.h \
-       egg-private.h \
-       egg-radio-box.h \
-       egg-scrolled-window.h \
-       egg-search-bar.h \
-       egg-settings-flag-action.h \
-       egg-settings-sandwich.h \
-       egg-signal-group.h \
-       egg-simple-label.h \
-       egg-simple-popover.h \
-       egg-slider.h \
+headers_DATA =                        \
+       egg-animation.h               \
+       egg-binding-group.h           \
+       egg-box.h                     \
+       egg-centering-bin.h           \
+       egg-column-layout.h           \
+       egg-counter.h                 \
+       egg-date-time.h               \
+       egg-empty-state.h             \
+       egg-entry-box.h               \
+       egg-file-chooser-entry.h      \
+       egg-frame-source.h            \
+       egg-heap.h                    \
+       egg-list-box.h                \
+       egg-menu-manager.h            \
+       egg-pill-box.h                \
+       egg-priority-box.h            \
+       egg-private.h                 \
+       egg-radio-box.h               \
+       egg-scrolled-window.h         \
+       egg-search-bar.h              \
+       egg-settings-flag-action.h    \
+       egg-settings-sandwich.h       \
+       egg-signal-group.h            \
+       egg-simple-label.h            \
+       egg-simple-popover.h          \
+       egg-slider.h                  \
        egg-state-machine-buildable.h \
-       egg-state-machine.h \
-       egg-task-cache.h \
-       egg-three-grid.h \
-       egg-widget-action-group.h \
+       egg-state-machine.h           \
+       egg-task-cache.h              \
+       egg-three-grid.h              \
+       egg-widget-action-group.h     \
        $(NULL)
 
-libegg_private_la_SOURCES = \
-       $(headers_DATA) \
-       egg-animation.c \
-       egg-binding-group.c \
-       egg-box.c \
-       egg-centering-bin.c \
-       egg-column-layout.c \
-       egg-counter.c \
-       egg-date-time.c \
-       egg-empty-state.c \
-       egg-entry-box.c \
-       egg-file-chooser-entry.c \
-       egg-frame-source.c \
-       egg-heap.c \
-       egg-list-box.c \
-       egg-menu-manager.c \
-       egg-pill-box.c \
-       egg-priority-box.c \
-       egg-radio-box.c \
-       egg-scrolled-window.c \
-       egg-search-bar.c \
-       egg-settings-flag-action.c \
-       egg-settings-sandwich.c \
-       egg-signal-group.c \
-       egg-simple-label.c \
-       egg-simple-popover.c \
-       egg-slider.c \
+libegg_private_la_SOURCES =           \
+       $(headers_DATA)               \
+       egg-animation.c               \
+       egg-binding-group.c           \
+       egg-box.c                     \
+       egg-centering-bin.c           \
+       egg-column-layout.c           \
+       egg-counter.c                 \
+       egg-date-time.c               \
+       egg-empty-state.c             \
+       egg-entry-box.c               \
+       egg-file-chooser-entry.c      \
+       egg-frame-source.c            \
+       egg-heap.c                    \
+       egg-list-box.c                \
+       egg-menu-manager.c            \
+       egg-pill-box.c                \
+       egg-priority-box.c            \
+       egg-radio-box.c               \
+       egg-scrolled-window.c         \
+       egg-search-bar.c              \
+       egg-settings-flag-action.c    \
+       egg-settings-sandwich.c       \
+       egg-signal-group.c            \
+       egg-simple-label.c            \
+       egg-simple-popover.c          \
+       egg-slider.c                  \
        egg-state-machine-buildable.c \
-       egg-state-machine.c \
-       egg-task-cache.c \
-       egg-three-grid.c \
-       egg-widget-action-group.c \
+       egg-state-machine.c           \
+       egg-task-cache.c              \
+       egg-three-grid.c              \
+       egg-widget-action-group.c     \
        $(NULL)
 
-nodist_libegg_private_la_SOURCES = \
-       egg-resources.c \
-       egg-resources.h \
+nodist_libegg_private_la_SOURCES =    \
+       egg-resources.c               \
+       egg-resources.h               \
        $(NULL)
 
 glib_resources_c = egg-resources.c
@@ -86,14 +86,14 @@ glib_resources_xml = egg.gresource.xml
 glib_resources_namespace = egg
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
-libegg_private_la_CFLAGS = \
-       $(EGG_CFLAGS) \
+libegg_private_la_CFLAGS =            \
+       $(EGG_CFLAGS)                 \
        $(NULL)
 
-libegg_private_la_LIBADD = \
-       $(EGG_LIBS) \
-       $(SHM_LIB) \
-       $(LIBM) \
+libegg_private_la_LIBADD =            \
+       $(EGG_LIBS)                   \
+       $(SHM_LIB)                    \
+       $(LIBM)                       \
        $(NULL)
 
 
@@ -109,9 +109,9 @@ Egg_1_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 Gtk-3.0
 Egg_1_0_gir_CFLAGS = $(libegg_private_la_CFLAGS)
 Egg_1_0_gir_LIBS = libegg-private.la
 Egg_1_0_gir_FILES = $(libegg_private_la_SOURCES)
-Egg_1_0_gir_SCANNERFLAGS = \
-       --c-include="egg-private.h" \
-       -n Egg \
+Egg_1_0_gir_SCANNERFLAGS =            \
+       --c-include="egg-private.h"   \
+       -n Egg                        \
        $(NULL)
 INTROSPECTION_GIRS += Egg-1.0.gir
 
diff --git a/contrib/gd/Makefile.am b/contrib/gd/Makefile.am
index 58c1820..15a0609 100644
--- a/contrib/gd/Makefile.am
+++ b/contrib/gd/Makefile.am
@@ -6,13 +6,13 @@ EXTRA_DIST =
 pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libgd-private.la
 
-libgd_private_la_SOURCES = \
-       gd-tagged-entry.c \
-       gd-tagged-entry.h \
+libgd_private_la_SOURCES =        \
+       gd-tagged-entry.c         \
+       gd-tagged-entry.h         \
        $(NULL)
 
 nodist_libgd_private_la_SOURCES = \
-       gd-resources.c \
+       gd-resources.c            \
        gd-resources.h
 
 glib_resources_c = gd-resources.c
diff --git a/contrib/gstyle/Makefile.am b/contrib/gstyle/Makefile.am
index c030375..7b065fb 100644
--- a/contrib/gstyle/Makefile.am
+++ b/contrib/gstyle/Makefile.am
@@ -9,77 +9,77 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libgstyle-private.la
 
 #gettextitsdir = $(datadir)/gettext/its
-EXTRA_DIST +=                     \
-       data/its/gstyle.its       \
+EXTRA_DIST +=                                       \
+       data/its/gstyle.its                         \
        data/its/gstyle.loc
 
 headersdir = $(includedir)/gnome-builder-@VERSION@/gstyle
-headers_DATA =                        \
-       gstyle-animation.h            \
-       gstyle-cielab.h               \
-       gstyle-color.h                \
-       gstyle-color-component.h      \
-       gstyle-color-convert.h        \
-       gstyle-color-filter.h         \
-       gstyle-color-item.h           \
-       gstyle-color-panel.h          \
-       gstyle-color-panel-private.h  \
-       gstyle-color-panel-actions.h  \
-       gstyle-color-plane.h          \
-       gstyle-color-predefined.h     \
-       gstyle-color-scale.h          \
-       gstyle-color-widget.h         \
-       gstyle-color-widget-actions.h \
-       gstyle-colorlexer.h           \
-       gstyle-css-provider.h         \
-       gstyle-eyedropper.h           \
-       gstyle-hsv.h                  \
-       gstyle-palette.h              \
-       gstyle-palette-widget.h       \
-       gstyle-private.h              \
-       gstyle-rename-popover.h       \
-       gstyle-revealer.h             \
-       gstyle-slidein.h              \
-       gstyle-types.h                \
-       gstyle-utils.h                \
-       gstyle-xyz.h                  \
+headers_DATA =                                      \
+       gstyle-animation.h                          \
+       gstyle-cielab.h                             \
+       gstyle-color.h                              \
+       gstyle-color-component.h                    \
+       gstyle-color-convert.h                      \
+       gstyle-color-filter.h                       \
+       gstyle-color-item.h                         \
+       gstyle-color-panel.h                        \
+       gstyle-color-panel-private.h                \
+       gstyle-color-panel-actions.h                \
+       gstyle-color-plane.h                        \
+       gstyle-color-predefined.h                   \
+       gstyle-color-scale.h                        \
+       gstyle-color-widget.h                       \
+       gstyle-color-widget-actions.h               \
+       gstyle-colorlexer.h                         \
+       gstyle-css-provider.h                       \
+       gstyle-eyedropper.h                         \
+       gstyle-hsv.h                                \
+       gstyle-palette.h                            \
+       gstyle-palette-widget.h                     \
+       gstyle-private.h                            \
+       gstyle-rename-popover.h                     \
+       gstyle-revealer.h                           \
+       gstyle-slidein.h                            \
+       gstyle-types.h                              \
+       gstyle-utils.h                              \
+       gstyle-xyz.h                                \
        $(NULL)
 
-libgstyle_private_la_SOURCES =        \
-       $(headers_DATA)               \
-       gstyle-animation.c            \
-       gstyle-cielab.c               \
-       gstyle-color.c                \
-       gstyle-color-component.c      \
-       gstyle-color-convert.c        \
-       gstyle-color-filter.c         \
-       gstyle-color-item.c           \
-       gstyle-color-panel.c          \
-       gstyle-color-panel-actions.c  \
-       gstyle-color-plane.c          \
-       gstyle-color-scale.c          \
-       gstyle-color-widget.c         \
-       gstyle-color-widget-actions.c \
-       gstyle-colorlexer.c           \
-       gstyle-css-provider.c         \
-       gstyle-eyedropper.c           \
-       gstyle-hsv.c                  \
-       gstyle-palette.c              \
-       gstyle-palette-widget.c       \
-       gstyle-rename-popover.c       \
-       gstyle-revealer.c             \
-       gstyle-slidein.c              \
-       gstyle-utils.c                \
-       gstyle-xyz.c                  \
+libgstyle_private_la_SOURCES =                      \
+       $(headers_DATA)                             \
+       gstyle-animation.c                          \
+       gstyle-cielab.c                             \
+       gstyle-color.c                              \
+       gstyle-color-component.c                    \
+       gstyle-color-convert.c                      \
+       gstyle-color-filter.c                       \
+       gstyle-color-item.c                         \
+       gstyle-color-panel.c                        \
+       gstyle-color-panel-actions.c                \
+       gstyle-color-plane.c                        \
+       gstyle-color-scale.c                        \
+       gstyle-color-widget.c                       \
+       gstyle-color-widget-actions.c               \
+       gstyle-colorlexer.c                         \
+       gstyle-css-provider.c                       \
+       gstyle-eyedropper.c                         \
+       gstyle-hsv.c                                \
+       gstyle-palette.c                            \
+       gstyle-palette-widget.c                     \
+       gstyle-rename-popover.c                     \
+       gstyle-revealer.c                           \
+       gstyle-slidein.c                            \
+       gstyle-utils.c                              \
+       gstyle-xyz.c                                \
        $(NULL)
 
-libgstyle_private_la_CFLAGS =            \
-       $(GSTYLE_CFLAGS)                 \
-       $(XML_CFLAGS)                    \
-       $(DEBUG_CFLAGS)                  \
-       $(OPTIMIZE_CFLAGS)               \
-       -I$(top_srcdir)/contrib/search   \
-       -I$(top_builddir)/contrib/search \
+libgstyle_private_la_CFLAGS =                       \
+       $(GSTYLE_CFLAGS)                            \
+       $(XML_CFLAGS)                               \
+       $(DEBUG_CFLAGS)                             \
+       $(OPTIMIZE_CFLAGS)                          \
+       -I$(top_srcdir)/contrib/search              \
+       -I$(top_builddir)/contrib/search            \
        $(NULL)
 
 libgstyle_private_la_LIBADD =                       \
@@ -89,14 +89,14 @@ libgstyle_private_la_LIBADD =                       \
        $(top_builddir)/contrib/search/libsearch.la \
        $(NULL)
 
-libgstyle_private_la_LDFLAGS = \
-       $(OPTIMIZE_LDFLAGS)    \
-       --no-undefined         \
+libgstyle_private_la_LDFLAGS =                      \
+       $(OPTIMIZE_LDFLAGS)                         \
+       --no-undefined                              \
        $(NULL)
 
-nodist_libgstyle_private_la_SOURCES = \
-       gstyle-resources.c            \
-       gstyle-resources.h            \
+nodist_libgstyle_private_la_SOURCES =               \
+       gstyle-resources.c                          \
+       gstyle-resources.h                          \
        $(NULL)
 
 glib_resources_h = gstyle-resources.h
@@ -113,39 +113,39 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-introspection_sources =          \
-       gstyle-cielab.h          \
-       gstyle-cielab.c          \
-       gstyle-color.h           \
-       gstyle-color.c           \
-       gstyle-color-component.h \
-       gstyle-color-component.c \
-       gstyle-color-convert.h   \
-       gstyle-color-convert.c   \
-       gstyle-color-filter.h    \
-       gstyle-color-filter.c    \
-       gstyle-color-item.h      \
-       gstyle-color-item.c      \
-       gstyle-color-panel.h     \
-       gstyle-color-panel.c     \
-       gstyle-color-plane.h     \
-       gstyle-color-plane.c     \
-       gstyle-color-scale.h     \
-       gstyle-color-scale.c     \
-       gstyle-color-widget.h    \
-       gstyle-color-widget.c    \
-       gstyle-eyedropper.h      \
-       gstyle-eyedropper.c      \
-       gstyle-hsv.h             \
-       gstyle-hsv.c             \
-       gstyle-palette.h         \
-       gstyle-palette.c         \
-       gstyle-palette-widget.h  \
-       gstyle-palette-widget.c  \
-       gstyle-slidein.h         \
-       gstyle-slidein.c         \
-       gstyle-xyz.h             \
-       gstyle-xyz.c             \
+introspection_sources =                             \
+       gstyle-cielab.h                             \
+       gstyle-cielab.c                             \
+       gstyle-color.h                              \
+       gstyle-color.c                              \
+       gstyle-color-component.h                    \
+       gstyle-color-component.c                    \
+       gstyle-color-convert.h                      \
+       gstyle-color-convert.c                      \
+       gstyle-color-filter.h                       \
+       gstyle-color-filter.c                       \
+       gstyle-color-item.h                         \
+       gstyle-color-item.c                         \
+       gstyle-color-panel.h                        \
+       gstyle-color-panel.c                        \
+       gstyle-color-plane.h                        \
+       gstyle-color-plane.c                        \
+       gstyle-color-scale.h                        \
+       gstyle-color-scale.c                        \
+       gstyle-color-widget.h                       \
+       gstyle-color-widget.c                       \
+       gstyle-eyedropper.h                         \
+       gstyle-eyedropper.c                         \
+       gstyle-hsv.h                                \
+       gstyle-hsv.c                                \
+       gstyle-palette.h                            \
+       gstyle-palette.c                            \
+       gstyle-palette-widget.h                     \
+       gstyle-palette-widget.c                     \
+       gstyle-slidein.h                            \
+       gstyle-slidein.c                            \
+       gstyle-xyz.h                                \
+       gstyle-xyz.c                                \
        $(NULL)
 
 Gstyle-1.0.gir: libgstyle-private.la
@@ -153,11 +153,11 @@ Gstyle_1_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 Gtk-3.0 GtkSource-3.0
 Gstyle_1_0_gir_CFLAGS = $(libgstyle_private_la_CFLAGS)
 Gstyle_1_0_gir_LIBS = libgstyle-private.la
 Gstyle_1_0_gir_FILES = $(introspection_sources)
-Gstyle_1_0_gir_SCANNERFLAGS =          \
-       --c-include="gstyle-private.h" \
-       -n Gstyle                      \
-       --identifier-prefix Gstyle     \
-       --symbol-prefix gstyle         \
+Gstyle_1_0_gir_SCANNERFLAGS =                       \
+       --c-include="gstyle-private.h"              \
+       -n Gstyle                                   \
+       --identifier-prefix Gstyle                  \
+       --symbol-prefix gstyle                      \
        $(NULL)
 INTROSPECTION_GIRS += Gstyle-1.0.gir
 
diff --git a/contrib/gstyle/tests/Makefile.am b/contrib/gstyle/tests/Makefile.am
index f507cb0..4066bca 100644
--- a/contrib/gstyle/tests/Makefile.am
+++ b/contrib/gstyle/tests/Makefile.am
@@ -1,10 +1,10 @@
 EXTRA_DIST =
 
-gstyle_cflags =                              \
-       $(DEBUG_CFLAGS)                      \
-       $(GSTYLE_CFLAGS)                     \
-       -I$(top_srcdir)/contrib/gstyle       \
-       -DTEST_DATA_DIR="\"$(abs_srcdir)/data\"" \
+gstyle_cflags =                                             \
+       $(DEBUG_CFLAGS)                                     \
+       $(GSTYLE_CFLAGS)                                    \
+       -I$(top_srcdir)/contrib/gstyle                      \
+       -DTEST_DATA_DIR="\"$(abs_srcdir)/data\""            \
        $(NULL)
 
 gstyle_libs =                                               \
@@ -12,30 +12,30 @@ gstyle_libs =                                               \
        $(top_builddir)/contrib/gstyle/libgstyle-private.la \
        $(NULL)
 
-tests_cflags =                   \
-       $(egg_cflags)            \
-       $(gstyle_cflags)         \
+tests_cflags =                                              \
+       $(egg_cflags)                                       \
+       $(gstyle_cflags)                                    \
        $(NULL)
 
-tests_libs =                                          \
-       $(gstyle_libs)                                \
-       $(top_builddir)/contrib/egg/libegg-private.la \
+tests_libs =                                                \
+       $(gstyle_libs)                                      \
+       $(top_builddir)/contrib/egg/libegg-private.la       \
        $(NULL)
 
-tests_ldflags =         \
-       -export-dynamic \
+tests_ldflags =                                             \
+       -export-dynamic                                     \
        $(NULL)
 
 misc_programs =
 
-TESTS_ENVIRONMENT =                                 \
-       GB_IN_TREE_PLUGINS=1                        \
-       G_TEST_SRCDIR="$(abs_srcdir)"               \
-       G_TEST_BUILDDIR="$(abs_builddir)"           \
-       G_DEBUG=gc-friendly                         \
-       GSETTINGS_BACKEND=memory                    \
-       MALLOC_CHECK_=2                             \
-       MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
+TESTS_ENVIRONMENT =                                         \
+       GB_IN_TREE_PLUGINS=1                                \
+       G_TEST_SRCDIR="$(abs_srcdir)"                       \
+       G_TEST_BUILDDIR="$(abs_builddir)"                   \
+       G_DEBUG=gc-friendly                                 \
+       GSETTINGS_BACKEND=memory                            \
+       MALLOC_CHECK_=2                                     \
+       MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))         \
        $(NULL)
 
 LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
@@ -91,9 +91,9 @@ endif
 
 check_PROGRAMS = $(TESTS) $(misc_programs)
 
-EXTRA_DIST +=                   \
-       data/palette.gpl        \
-       data/palette.gstyle.xml \
+EXTRA_DIST +=                                               \
+       data/palette.gpl                                    \
+       data/palette.gstyle.xml                             \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/jsonrpc-glib/Makefile.am b/contrib/jsonrpc-glib/Makefile.am
index 11a552e..a45dcb2 100644
--- a/contrib/jsonrpc-glib/Makefile.am
+++ b/contrib/jsonrpc-glib/Makefile.am
@@ -4,30 +4,30 @@ EXTRA_DIST =
 
 noinst_LTLIBRARIES = libjsonrpc-glib.la
 
-libjsonrpc_glib_la_public_sources = \
-       jsonrpc-client.c \
-       jsonrpc-client.h \
-       jsonrpc-input-stream.c \
-       jsonrpc-input-stream.h \
-       jsonrpc-output-stream.c \
-       jsonrpc-output-stream.h \
-       jsonrpc-server.c \
-       jsonrpc-server.h \
-       jsonrpc-version.h \
+libjsonrpc_glib_la_public_sources =          \
+       jsonrpc-client.c                     \
+       jsonrpc-client.h                     \
+       jsonrpc-input-stream.c               \
+       jsonrpc-input-stream.h               \
+       jsonrpc-output-stream.c              \
+       jsonrpc-output-stream.h              \
+       jsonrpc-server.c                     \
+       jsonrpc-server.h                     \
+       jsonrpc-version.h                    \
        $(NULL)
 
-libjsonrpc_glib_la_SOURCES = \
+libjsonrpc_glib_la_SOURCES =                 \
        $(libjsonrpc_glib_la_public_sources) \
-       jsonrpc-glib.h \
-       jcon.c \
-       jcon.h \
+       jsonrpc-glib.h                       \
+       jcon.c                               \
+       jcon.h                               \
        $(NULL)
 
-libjsonrpc_glib_la_CFLAGS = \
-       -DJSONRPC_GLIB_COMPILATION \
-       $(DEBUG_CFLAGS) \
-       $(JSONRPC_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
+libjsonrpc_glib_la_CFLAGS =                  \
+       -DJSONRPC_GLIB_COMPILATION           \
+       $(DEBUG_CFLAGS)                      \
+       $(JSONRPC_CFLAGS)                    \
+       $(OPTIMIZE_CFLAGS)                   \
        $(NULL)
 
 libjsonrpc_glib_la_LIBADD = $(JSONRPC_LIBS)
@@ -45,9 +45,9 @@ Jsonrpc_1_0_gir_INCLUDES = Gio-2.0 Json-1.0
 Jsonrpc_1_0_gir_CFLAGS = $(libjsonrpc_glib_la_CFLAGS)
 Jsonrpc_1_0_gir_LIBS = libjsonrpc-glib.la
 Jsonrpc_1_0_gir_FILES = $(libjsonrpc_glib_la_public_sources)
-Jsonrpc_1_0_gir_SCANNERFLAGS = \
-       --c-include="jsonrpc-glib.h" \
-       -n Jsonrpc \
+Jsonrpc_1_0_gir_SCANNERFLAGS =               \
+       --c-include="jsonrpc-glib.h"         \
+       -n Jsonrpc                           \
        $(NULL)
 INTROSPECTION_GIRS += Jsonrpc-1.0.gir
 
diff --git a/contrib/libeditorconfig/Makefile.am b/contrib/libeditorconfig/Makefile.am
index 3387308..7a0c881 100644
--- a/contrib/libeditorconfig/Makefile.am
+++ b/contrib/libeditorconfig/Makefile.am
@@ -2,38 +2,38 @@ if ENABLE_EDITORCONFIG
 
 noinst_LTLIBRARIES = libeditorconfig.la
 
-libeditorconfig_la_SOURCES = \
-       ec_glob.c \
-       ec_glob.h \
-       editorconfig.c \
-       editorconfig.h \
-       editorconfig/editorconfig.h \
+libeditorconfig_la_SOURCES =               \
+       ec_glob.c                          \
+       ec_glob.h                          \
+       editorconfig.c                     \
+       editorconfig.h                     \
+       editorconfig/editorconfig.h        \
        editorconfig/editorconfig_handle.h \
-       editorconfig_handle.c \
-       editorconfig_handle.h \
-       global.h \
-       ini.c \
-       ini.h \
-       misc.c \
-       misc.h \
-       utarray.h \
+       editorconfig_handle.c              \
+       editorconfig_handle.h              \
+       global.h                           \
+       ini.c                              \
+       ini.h                              \
+       misc.c                             \
+       misc.h                             \
+       utarray.h                          \
        $(NULL)
 
-libeditorconfig_la_LIBADD = \
-       -lpcre \
+libeditorconfig_la_LIBADD =                \
+       -lpcre                             \
        $(NULL)
 
-libeditorconfig_la_CFLAGS = \
-       -D_GNU_SOURCE \
-       -DHAVE_STRCASECMP \
-       -DHAVE_STRICMP \
-       -DHAVE_STRDUP \
-       -DHAVE_STRNDUP \
-       -DUNIX \
-       -Deditorconfig_VERSION_MAJOR=0 \
-       -Deditorconfig_VERSION_MINOR=0 \
-       -Deditorconfig_VERSION_PATCH=0 \
-       -Deditorconfig_VERSION_SUFFIX=0 \
+libeditorconfig_la_CFLAGS =                \
+       -D_GNU_SOURCE                      \
+       -DHAVE_STRCASECMP                  \
+       -DHAVE_STRICMP                     \
+       -DHAVE_STRDUP                      \
+       -DHAVE_STRNDUP                     \
+       -DUNIX                             \
+       -Deditorconfig_VERSION_MAJOR=0     \
+       -Deditorconfig_VERSION_MINOR=0     \
+       -Deditorconfig_VERSION_PATCH=0     \
+       -Deditorconfig_VERSION_SUFFIX=0    \
        $(NULL)
 
 endif
diff --git a/contrib/nautilus/Makefile.am b/contrib/nautilus/Makefile.am
index ac11732..d44435f 100644
--- a/contrib/nautilus/Makefile.am
+++ b/contrib/nautilus/Makefile.am
@@ -1,22 +1,22 @@
 noinst_LTLIBRARIES = libnautilus.la
 
-libnautilus_la_SOURCES = \
+libnautilus_la_SOURCES =        \
        nautilus-floating-bar.c \
        nautilus-floating-bar.h \
        $(NULL)
 
-libnautilus_la_CFLAGS = \
-       $(DEBUG_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
-       $(NAUTILUS_CFLAGS) \
+libnautilus_la_CFLAGS =         \
+       $(DEBUG_CFLAGS)         \
+       $(OPTIMIZE_CFLAGS)      \
+       $(NAUTILUS_CFLAGS)      \
        $(NULL)
 
-libnautilus_la_LIBADD = \
-       $(NAUTILUS_LIBADD) \
+libnautilus_la_LIBADD =         \
+       $(NAUTILUS_LIBADD)      \
        $(NULL)
 
-libnautilus_la_LDFLAGS = \
-       $(OPTIMIZE_LDFLAGS) \
+libnautilus_la_LDFLAGS =        \
+       $(OPTIMIZE_LDFLAGS)     \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/pnl/Makefile.am b/contrib/pnl/Makefile.am
index 98e0ef4..a31bb5c 100644
--- a/contrib/pnl/Makefile.am
+++ b/contrib/pnl/Makefile.am
@@ -7,71 +7,71 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libpanel-gtk.la
 
 headersdir = $(includedir)/gnome-builder-@VERSION@/pnl
-headers_DATA = \
-       pnl-animation.h \
-       pnl-dock-bin.h \
-       pnl-dock-bin-edge.h \
-       pnl-dock-item.h \
-       pnl-dock-manager.h \
-       pnl-dock-overlay.h \
-       pnl-dock-overlay-edge.h \
-       pnl-dock-paned.h \
-       pnl-dock-revealer.h \
-       pnl-dock-stack.h \
-       pnl-dock-types.h \
-       pnl-dock-widget.h \
-       pnl-dock-window.h \
-       pnl-dock.h \
-       pnl-frame-source.h \
-       pnl-multi-paned.h \
-       pnl-tab-strip.h \
-       pnl-tab.h \
-       pnl-version.h \
-       pnl.h \
+headers_DATA =                      \
+       pnl-animation.h             \
+       pnl-dock-bin.h              \
+       pnl-dock-bin-edge.h         \
+       pnl-dock-item.h             \
+       pnl-dock-manager.h          \
+       pnl-dock-overlay.h          \
+       pnl-dock-overlay-edge.h     \
+       pnl-dock-paned.h            \
+       pnl-dock-revealer.h         \
+       pnl-dock-stack.h            \
+       pnl-dock-types.h            \
+       pnl-dock-widget.h           \
+       pnl-dock-window.h           \
+       pnl-dock.h                  \
+       pnl-frame-source.h          \
+       pnl-multi-paned.h           \
+       pnl-tab-strip.h             \
+       pnl-tab.h                   \
+       pnl-version.h               \
+       pnl.h                       \
        $(NULL)
 
-libpanel_gtk_la_SOURCES = \
-       $(headers_DATA) \
-       pnl-animation.c \
-       pnl-dock-bin-edge.c \
+libpanel_gtk_la_SOURCES =           \
+       $(headers_DATA)             \
+       pnl-animation.c             \
+       pnl-dock-bin-edge.c         \
        pnl-dock-bin-edge-private.h \
-       pnl-dock-bin.c \
-       pnl-dock-item.c \
-       pnl-dock-manager.c \
-       pnl-dock-overlay-edge.c \
-       pnl-dock-overlay.c \
-       pnl-dock-paned-private.h \
-       pnl-dock-paned.c \
-       pnl-dock-revealer.c \
-       pnl-dock-stack.c \
-       pnl-dock-tab-strip.c \
-       pnl-dock-tab-strip.h \
-       pnl-dock-transient-grab.c \
-       pnl-dock-transient-grab.h \
-       pnl-dock-widget.c \
-       pnl-dock-window.c \
-       pnl-dock.c \
-       pnl-frame-source.c \
-       pnl-multi-paned.c \
-       pnl-tab-strip.c \
-       pnl-tab.c \
-       pnl-util-private.h \
-       pnl-util.c \
+       pnl-dock-bin.c              \
+       pnl-dock-item.c             \
+       pnl-dock-manager.c          \
+       pnl-dock-overlay-edge.c     \
+       pnl-dock-overlay.c          \
+       pnl-dock-paned-private.h    \
+       pnl-dock-paned.c            \
+       pnl-dock-revealer.c         \
+       pnl-dock-stack.c            \
+       pnl-dock-tab-strip.c        \
+       pnl-dock-tab-strip.h        \
+       pnl-dock-transient-grab.c   \
+       pnl-dock-transient-grab.h   \
+       pnl-dock-widget.c           \
+       pnl-dock-window.c           \
+       pnl-dock.c                  \
+       pnl-frame-source.c          \
+       pnl-multi-paned.c           \
+       pnl-tab-strip.c             \
+       pnl-tab.c                   \
+       pnl-util-private.h          \
+       pnl-util.c                  \
        $(NULL)
 
 nodist_libpanel_gtk_la_SOURCES = pnl-resources.c pnl-resources.h
 
-libpanel_gtk_la_CFLAGS = \
-       -DPNL_COMPILATION \
-       $(PANEL_GTK_CFLAGS) \
+libpanel_gtk_la_CFLAGS =            \
+       -DPNL_COMPILATION           \
+       $(PANEL_GTK_CFLAGS)         \
        $(NULL)
 
-libpanel_gtk_la_LIBADD = \
-       $(PANEL_GTK_LIBS) \
+libpanel_gtk_la_LIBADD =            \
+       $(PANEL_GTK_LIBS)           \
        $(NULL)
 
-libpanel_gtk_la_LDFLAGS = \
-       -no-undefined \
+libpanel_gtk_la_LDFLAGS =           \
+       -no-undefined               \
        $(NULL)
 
 
@@ -94,9 +94,9 @@ Pnl_1_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 Gtk-3.0
 Pnl_1_0_gir_CFLAGS = $(libpanel_gtk_la_CFLAGS) -DPNL_COMPILATION
 Pnl_1_0_gir_LIBS = libpanel-gtk.la
 Pnl_1_0_gir_FILES = $(libpanel_gtk_la_SOURCES)
-Pnl_1_0_gir_SCANNERFLAGS = \
-       --c-include="pnl.h" \
-       -n Pnl \
+Pnl_1_0_gir_SCANNERFLAGS =          \
+       --c-include="pnl.h"         \
+       -n Pnl                      \
        $(NULL)
 INTROSPECTION_GIRS += Pnl-1.0.gir
 
diff --git a/contrib/rg/Makefile.am b/contrib/rg/Makefile.am
index a0013a3..4ba3ca2 100644
--- a/contrib/rg/Makefile.am
+++ b/contrib/rg/Makefile.am
@@ -1,41 +1,41 @@
 pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = librg.la
 
-librg_la_SOURCES = \
-       realtime-graphs.h \
-       rg-column.c \
-       rg-column.h \
-       rg-column-private.h \
-       rg-cpu-graph.c \
-       rg-cpu-graph.h \
-       rg-cpu-table.c \
-       rg-cpu-table.h \
-       rg-graph.c \
-       rg-graph.h \
-       rg-line-renderer.c \
-       rg-line-renderer.h \
-       rg-renderer.c \
-       rg-renderer.h \
-       rg-ring.c \
-       rg-ring.h \
-       rg-table.c \
-       rg-table.h \
+librg_la_SOURCES =                                    \
+       realtime-graphs.h                             \
+       rg-column.c                                   \
+       rg-column.h                                   \
+       rg-column-private.h                           \
+       rg-cpu-graph.c                                \
+       rg-cpu-graph.h                                \
+       rg-cpu-table.c                                \
+       rg-cpu-table.h                                \
+       rg-graph.c                                    \
+       rg-graph.h                                    \
+       rg-line-renderer.c                            \
+       rg-line-renderer.h                            \
+       rg-renderer.c                                 \
+       rg-renderer.h                                 \
+       rg-ring.c                                     \
+       rg-ring.h                                     \
+       rg-table.c                                    \
+       rg-table.h                                    \
        $(NULL)
 
-librg_la_CFLAGS = \
-       -I$(top_srcdir)/contrib/egg \
-       $(DEBUG_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
-       $(RG_CFLAGS) \
+librg_la_CFLAGS =                                     \
+       -I$(top_srcdir)/contrib/egg                   \
+       $(DEBUG_CFLAGS)                               \
+       $(OPTIMIZE_CFLAGS)                            \
+       $(RG_CFLAGS)                                  \
        $(NULL)
 
-librg_la_LIBADD = \
-       $(RG_LIBS) \
+librg_la_LIBADD =                                     \
+       $(RG_LIBS)                                    \
        $(top_builddir)/contrib/egg/libegg-private.la \
        $(NULL)
 
-librg_la_LDFLAGS = \
-       $(OPTIMIZE_LDFLAGS) \
+librg_la_LDFLAGS =                                    \
+       $(OPTIMIZE_LDFLAGS)                           \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/search/Makefile.am b/contrib/search/Makefile.am
index 7486096..3639c47 100644
--- a/contrib/search/Makefile.am
+++ b/contrib/search/Makefile.am
@@ -1,24 +1,24 @@
 pkglibdir = $(libdir)/gnome-builder/
 pkglib_LTLIBRARIES = libsearch.la
 
-libsearch_la_SOURCES = \
-       trie.c \
-       trie.h \
-       fuzzy.c \
-       fuzzy.h \
+libsearch_la_SOURCES =      \
+       trie.c              \
+       trie.h              \
+       fuzzy.c             \
+       fuzzy.h             \
        $(NULL)
 
-libsearch_la_CFLAGS = \
-       $(DEBUG_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
-       $(SEARCH_CFLAGS) \
+libsearch_la_CFLAGS =       \
+       $(DEBUG_CFLAGS)     \
+       $(OPTIMIZE_CFLAGS)  \
+       $(SEARCH_CFLAGS)    \
        $(NULL)
 
-libsearch_la_LIBADD = \
-       $(SEARCH_LIBADD) \
+libsearch_la_LIBADD =       \
+       $(SEARCH_LIBADD)    \
        $(NULL)
 
-libsearch_la_LDFLAGS = \
+libsearch_la_LDFLAGS =      \
        $(OPTIMIZE_LDFLAGS) \
        $(NULL)
 
diff --git a/contrib/tmpl/Makefile.am b/contrib/tmpl/Makefile.am
index fcc3c83..97fa1c2 100644
--- a/contrib/tmpl/Makefile.am
+++ b/contrib/tmpl/Makefile.am
@@ -4,83 +4,83 @@ BUILT_SOURCES =
 
 pkglib_LTLIBRARIES = libtemplate-glib-1.0.la
 
-AM_CPPFLAGS = \
-       -D_GNU_SOURCE \
+AM_CPPFLAGS =                            \
+       -D_GNU_SOURCE                    \
        -DTMPL_GLIB_COMPILATION
 
-EXTRA_DIST = \
-       tmpl-expr-parser.c \
-       tmpl-expr-parser.h \
-       tmpl-expr-scanner.c \
-       tmpl-expr-scanner.h \
+EXTRA_DIST =                             \
+       tmpl-expr-parser.c               \
+       tmpl-expr-parser.h               \
+       tmpl-expr-scanner.c              \
+       tmpl-expr-scanner.h              \
        $(NULL)
 
 pkgincludedir = $(includedir)/gnome-builder-@VERSION@/template-glib
-pkginclude_HEADERS = \
-       tmpl-error.h \
-       tmpl-expr-types.h \
-       tmpl-expr.h \
-       tmpl-glib.h \
-       tmpl-scope.h \
-       tmpl-symbol.h \
-       tmpl-template-locator.h \
-       tmpl-template.h \
+pkginclude_HEADERS =                     \
+       tmpl-error.h                     \
+       tmpl-expr-types.h                \
+       tmpl-expr.h                      \
+       tmpl-glib.h                      \
+       tmpl-scope.h                     \
+       tmpl-symbol.h                    \
+       tmpl-template-locator.h          \
+       tmpl-template.h                  \
        $(NULL)
 
 libtemplate_glib_1_0_la_CFLAGS = $(TMPL_CFLAGS)
 libtemplate_glib_1_0_la_LIBADD = $(TMPL_LIBS) $(LIBM)
-libtemplate_glib_1_0_la_SOURCES = \
-       $(pkginclude_HEADERS) \
-       tmpl-branch-node.c \
-       tmpl-branch-node.h \
-       tmpl-condition-node.c \
-       tmpl-condition-node.h \
-       tmpl-debug.h \
-       tmpl-error.c \
-       tmpl-expr-eval.c \
-       tmpl-expr-node.c \
-       tmpl-expr-node.h \
-       tmpl-expr-parser-private.h \
-       tmpl-expr-parser.y \
-       tmpl-expr-private.h \
-       tmpl-expr-scanner.l \
-       tmpl-expr.c \
-       tmpl-gi-private.h \
-       tmpl-gi.c \
-       tmpl-iter-node.c \
-       tmpl-iter-node.h \
-       tmpl-iterator.c \
-       tmpl-iterator.h \
-       tmpl-lexer.c \
-       tmpl-lexer.h \
-       tmpl-node.c \
-       tmpl-node.h \
-       tmpl-parser.c \
-       tmpl-parser.h \
-       tmpl-scope.c \
-       tmpl-symbol.c \
-       tmpl-template-locator.c \
-       tmpl-template.c \
-       tmpl-text-node.c \
-       tmpl-text-node.h \
-       tmpl-token-input-stream.c \
-       tmpl-token-input-stream.h \
-       tmpl-token.c \
-       tmpl-token.h \
-       tmpl-util-private.h \
-       tmpl-util.c \
+libtemplate_glib_1_0_la_SOURCES =        \
+       $(pkginclude_HEADERS)            \
+       tmpl-branch-node.c               \
+       tmpl-branch-node.h               \
+       tmpl-condition-node.c            \
+       tmpl-condition-node.h            \
+       tmpl-debug.h                     \
+       tmpl-error.c                     \
+       tmpl-expr-eval.c                 \
+       tmpl-expr-node.c                 \
+       tmpl-expr-node.h                 \
+       tmpl-expr-parser-private.h       \
+       tmpl-expr-parser.y               \
+       tmpl-expr-private.h              \
+       tmpl-expr-scanner.l              \
+       tmpl-expr.c                      \
+       tmpl-gi-private.h                \
+       tmpl-gi.c                        \
+       tmpl-iter-node.c                 \
+       tmpl-iter-node.h                 \
+       tmpl-iterator.c                  \
+       tmpl-iterator.h                  \
+       tmpl-lexer.c                     \
+       tmpl-lexer.h                     \
+       tmpl-node.c                      \
+       tmpl-node.h                      \
+       tmpl-parser.c                    \
+       tmpl-parser.h                    \
+       tmpl-scope.c                     \
+       tmpl-symbol.c                    \
+       tmpl-template-locator.c          \
+       tmpl-template.c                  \
+       tmpl-text-node.c                 \
+       tmpl-text-node.h                 \
+       tmpl-token-input-stream.c        \
+       tmpl-token-input-stream.h        \
+       tmpl-token.c                     \
+       tmpl-token.h                     \
+       tmpl-util-private.h              \
+       tmpl-util.c                      \
        $(NULL)
 
 nodist_libtemplate_glib_1_0_la_SOURCES = \
-       tmpl-enums.c \
-       tmpl-enums.h \
+       tmpl-enums.c                     \
+       tmpl-enums.h                     \
        $(NULL)
 
 glib_enum_h = tmpl-enums.h
 glib_enum_c = tmpl-enums.c
-glib_enum_headers = \
-       tmpl-error.h \
-       tmpl-expr-types.h \
+glib_enum_headers =                      \
+       tmpl-error.h                     \
+       tmpl-expr-types.h                \
        $(NULL)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
@@ -91,21 +91,21 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-introspection_sources = \
-       tmpl-enums.c \
-       tmpl-enums.h \
-       tmpl-error.h \
-       tmpl-expr.c \
-       tmpl-expr.h \
-       tmpl-expr-types.h \
-       tmpl-scope.c \
-       tmpl-scope.h \
-       tmpl-symbol.c \
-       tmpl-symbol.h \
-       tmpl-template-locator.c \
-       tmpl-template-locator.h \
-       tmpl-template.c \
-       tmpl-template.h \
+introspection_sources =                  \
+       tmpl-enums.c                     \
+       tmpl-enums.h                     \
+       tmpl-error.h                     \
+       tmpl-expr.c                      \
+       tmpl-expr.h                      \
+       tmpl-expr-types.h                \
+       tmpl-scope.c                     \
+       tmpl-scope.h                     \
+       tmpl-symbol.c                    \
+       tmpl-symbol.h                    \
+       tmpl-template-locator.c          \
+       tmpl-template-locator.h          \
+       tmpl-template.c                  \
+       tmpl-template.h                  \
        $(NULL)
 
 Template-1.0.gir: libtemplate-glib-1.0.la
@@ -113,11 +113,11 @@ Template_1_0_gir_INCLUDES = Gio-2.0
 Template_1_0_gir_CFLAGS = $(libtemplate_glib_1_0_la_CFLAGS)
 Template_1_0_gir_LIBS = libtemplate-glib-1.0.la
 Template_1_0_gir_FILES = $(introspection_sources)
-Template_1_0_gir_SCANNERFLAGS = \
-       -n Template \
-       --identifier-prefix Tmpl \
-       --symbol-prefix tmpl \
-       -DTMPL_GLIB_COMPILATION \
+Template_1_0_gir_SCANNERFLAGS =          \
+       -n Template                      \
+       --identifier-prefix Tmpl         \
+       --symbol-prefix tmpl             \
+       -DTMPL_GLIB_COMPILATION          \
        $(NULL)
 INTROSPECTION_GIRS += Template-1.0.gir
 
@@ -127,10 +127,10 @@ pkggir_DATA = $(INTROSPECTION_GIRS)
 pkgtypelibdir = $(libdir)/gnome-builder/girepository-1.0
 pkgtypelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += \
-       $(pkggir_DATA) \
-       $(pkgtypelib_DATA) \
-       tmpl-expr-scanner.c \
+CLEANFILES +=                            \
+       $(pkggir_DATA)                   \
+       $(pkgtypelib_DATA)               \
+       tmpl-expr-scanner.c              \
        tmpl-expr-scanner.h
 endif
 
@@ -151,21 +151,21 @@ template-glib-1.0.deps: Makefile
 vapidir = $(datadir)/gnome-builder/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-EXTRA_DIST += \
-       template-glib-1.0.deps \
+EXTRA_DIST +=                            \
+       template-glib-1.0.deps           \
        Template-1.0.metadata
 
 DISTCLEANFILES += $(vapi_DATA)
 endif
 
-GITIGNOREFILES = \
-       tmpl-expr-parser.c \
-       tmpl-expr-parser.h \
-       tmpl-expr-scanner.c \
-       tmpl-expr-scanner.h \
-       tmpl-debug.h \
-       *.typelib \
-       *.gir \
+GITIGNOREFILES =                         \
+       tmpl-expr-parser.c               \
+       tmpl-expr-parser.h               \
+       tmpl-expr-scanner.c              \
+       tmpl-expr-scanner.h              \
+       tmpl-debug.h                     \
+       *.typelib                        \
+       *.gir                            \
        lex.*
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/xml/Makefile.am b/contrib/xml/Makefile.am
index 2263449..f1e551b 100644
--- a/contrib/xml/Makefile.am
+++ b/contrib/xml/Makefile.am
@@ -2,17 +2,17 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libxml-private.la
 
 libxml_private_la_SOURCES = \
-       xml-reader.c \
-       xml-reader.h \
+       xml-reader.c        \
+       xml-reader.h        \
        $(NULL)
 
-libxml_private_la_CFLAGS = \
-       $(DEBUG_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
-       $(XML_CFLAGS) \
+libxml_private_la_CFLAGS =  \
+       $(DEBUG_CFLAGS)     \
+       $(OPTIMIZE_CFLAGS)  \
+       $(XML_CFLAGS)       \
        $(NULL)
 
-libxml_private_la_LIBADD = \
+libxml_private_la_LIBADD =  \
        $(XML_LIBS)
        $(NULL)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index df62a0a..3572a89 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,35 +24,35 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 # pkg-config
 pkgconfigdir = $(libdir)/gnome-builder/pkgconfig
-pkgconfig_DATA = \
-       libide-1.0.pc \
+pkgconfig_DATA =                                   \
+       libide-1.0.pc                              \
        template-glib-1.0.pc
 
 org.gnome.Builder.service: org.gnome.Builder.service.in
-       $(AM_V_GEN)     \
+       $(AM_V_GEN)                                \
                [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
                sed -e "s|\@bindir\@|$(bindir)|" $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST = \
-       $(appstream_in_files) \
-       $(desktop_in_in_files) \
-       $(service_in_files) \
+EXTRA_DIST =                                       \
+       $(appstream_in_files)                      \
+       $(desktop_in_in_files)                     \
+       $(service_in_files)                        \
        $(NULL)
 
-CLEANFILES = \
-       $(appstream_XML) \
-       $(desktop_DATA) \
-       $(desktop_in_files) \
-       $(service_DATA) \
+CLEANFILES =                                       \
+       $(appstream_XML)                           \
+       $(desktop_DATA)                            \
+       $(desktop_in_files)                        \
+       $(service_DATA)                            \
        $(NULL)
 
-DISTCLEANFILES = \
-       $(desktop_in_files) \
+DISTCLEANFILES =                                   \
+       $(desktop_in_files)                        \
        $(NULL)
 
 desktop-file-validate: $(desktop_DATA)
-       for f in $^; do \
-               $(DESKTOP_FILE_VALIDATE) $$f; \
+       for f in $^; do                            \
+               $(DESKTOP_FILE_VALIDATE) $$f;      \
        done
 
 check-local: desktop-file-validate
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index fe07ec3..dc8fa32 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,5 +1,5 @@
 fontdir = $(datadir)/gnome-builder/fonts
-dist_font_DATA = \
+dist_font_DATA =          \
        BuilderBlocks.ttf \
        $(NULL)
 
diff --git a/data/gsettings/Makefile.am b/data/gsettings/Makefile.am
index 26ab015..52c0c10 100644
--- a/data/gsettings/Makefile.am
+++ b/data/gsettings/Makefile.am
@@ -1,14 +1,14 @@
-gsettings_SCHEMAS = \
-       org.gnome.builder.build.gschema.xml \
-       org.gnome.builder.code-insight.gschema.xml \
-       org.gnome.builder.editor.gschema.xml \
+gsettings_SCHEMAS =                                   \
+       org.gnome.builder.build.gschema.xml           \
+       org.gnome.builder.code-insight.gschema.xml    \
+       org.gnome.builder.editor.gschema.xml          \
        org.gnome.builder.editor.language.gschema.xml \
-       org.gnome.builder.extension-type.gschema.xml \
-       org.gnome.builder.gschema.xml \
-       org.gnome.builder.plugin.gschema.xml \
-       org.gnome.builder.project-tree.gschema.xml \
-       org.gnome.builder.terminal.gschema.xml \
-       org.gnome.builder.workbench.gschema.xml \
+       org.gnome.builder.extension-type.gschema.xml  \
+       org.gnome.builder.gschema.xml                 \
+       org.gnome.builder.plugin.gschema.xml          \
+       org.gnome.builder.project-tree.gschema.xml    \
+       org.gnome.builder.terminal.gschema.xml        \
+       org.gnome.builder.workbench.gschema.xml       \
        $(NULL)
 
 .PRECIOUS: $(gsettings_SCHEMAS)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index f0ae26f..18887df 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,14 +2,14 @@ SUBDIRS = hicolor
 
 icondir = $(datadir)/icons
 
-nobase_icon_DATA = \
-       hicolor/256x256/apps/org.gnome.Builder.png \
-       hicolor/512x512/apps/org.gnome.Builder.png \
-       hicolor/16x16/apps/org.gnome.Builder.png \
-       hicolor/32x32/apps/org.gnome.Builder.png \
-       hicolor/48x48/apps/org.gnome.Builder.png \
-       hicolor/24x24/apps/org.gnome.Builder.png \
-       hicolor/symbolic/apps/org.gnome.Builder-symbolic.svg \
+nobase_icon_DATA =                                                                \
+       hicolor/256x256/apps/org.gnome.Builder.png                                \
+       hicolor/512x512/apps/org.gnome.Builder.png                                \
+       hicolor/16x16/apps/org.gnome.Builder.png                                  \
+       hicolor/32x32/apps/org.gnome.Builder.png                                  \
+       hicolor/48x48/apps/org.gnome.Builder.png                                  \
+       hicolor/24x24/apps/org.gnome.Builder.png                                  \
+       hicolor/symbolic/apps/org.gnome.Builder-symbolic.svg                      \
        $(NULL)
 
 EXTRA_DIST = $(nobase_icon_DATA)
@@ -19,12 +19,12 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               $(gtk_update_icon_cache); \
-       else \
+       @-if test -z "$(DESTDIR)"; then                                           \
+               echo "Updating Gtk icon cache.";                                  \
+               $(gtk_update_icon_cache);                                         \
+       else                                                                      \
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
-               echo "***   $(gtk_update_icon_cache)"; \
+               echo "***   $(gtk_update_icon_cache)";                            \
        fi
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
index 2e9b36f..de6a9b2 100644
--- a/data/icons/hicolor/Makefile.am
+++ b/data/icons/hicolor/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST =
 
 noinst_LTLIBRARIES = libicons.la
 
-nodist_libicons_la_SOURCES = \
+nodist_libicons_la_SOURCES =  \
        ide-icons-resources.c \
        ide-icons-resources.h
 
diff --git a/data/style-schemes/Makefile.am b/data/style-schemes/Makefile.am
index 9df6148..3e6073a 100644
--- a/data/style-schemes/Makefile.am
+++ b/data/style-schemes/Makefile.am
@@ -1,7 +1,7 @@
 styledir = $(datadir)/gtksourceview-3.0/styles/
 
-style_DATA = \
-       builder.xml \
+style_DATA =             \
+       builder.xml      \
        builder-dark.xml \
        $(NULL)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78b47b9..71bdf47 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,43 +1,43 @@
 SUBDIRS = examples
 
-EXTRA_DIST = \
-       api/index.rst \
-       credits.rst \
-       index.rst \
-       introduction.rst \
-       plugins/building/buildsystem.rst \
-       plugins/building/index.rst \
-       plugins/building/pipeline.rst \
-       plugins/creating.rst \
-       plugins/devices.rst \
-       plugins/editor/autocompletion.rst \
-       plugins/editor/buffers.rst \
-       plugins/editor/diagnostics.rst \
-       plugins/editor/filesettings.rst \
-       plugins/editor/highlighting.rst \
-       plugins/editor/index.rst \
-       plugins/editor/snippets.rst \
-       plugins/greeter.rst \
-       plugins/headerbar.rst \
-       plugins/index.rst \
-       plugins/keybindings.rst \
-       plugins/langserv.rst \
-       plugins/preferences.rst \
-       plugins/processes/index.rst \
-       plugins/processes/runtimes.rst \
+EXTRA_DIST =                               \
+       api/index.rst                      \
+       credits.rst                        \
+       index.rst                          \
+       introduction.rst                   \
+       plugins/building/buildsystem.rst   \
+       plugins/building/index.rst         \
+       plugins/building/pipeline.rst      \
+       plugins/creating.rst               \
+       plugins/devices.rst                \
+       plugins/editor/autocompletion.rst  \
+       plugins/editor/buffers.rst         \
+       plugins/editor/diagnostics.rst     \
+       plugins/editor/filesettings.rst    \
+       plugins/editor/highlighting.rst    \
+       plugins/editor/index.rst           \
+       plugins/editor/snippets.rst        \
+       plugins/greeter.rst                \
+       plugins/headerbar.rst              \
+       plugins/index.rst                  \
+       plugins/keybindings.rst            \
+       plugins/langserv.rst               \
+       plugins/preferences.rst            \
+       plugins/processes/index.rst        \
+       plugins/processes/runtimes.rst     \
        plugins/processes/subprocesses.rst \
-       plugins/running.rst \
-       plugins/search.rst \
-       plugins/subprocesses.rst \
-       plugins/symbols/gotodef.rst \
-       plugins/symbols/index.rst \
-       plugins/symbols/rename.rst \
-       plugins/symbols/symbols.rst \
-       plugins/transfers.rst \
-       plugins/vcs.rst \
-       plugins/workbench.rst \
-       plugins/workers.rst \
-       workbench.rst \
+       plugins/running.rst                \
+       plugins/search.rst                 \
+       plugins/subprocesses.rst           \
+       plugins/symbols/gotodef.rst        \
+       plugins/symbols/index.rst          \
+       plugins/symbols/rename.rst         \
+       plugins/symbols/symbols.rst        \
+       plugins/transfers.rst              \
+       plugins/vcs.rst                    \
+       plugins/workbench.rst              \
+       plugins/workers.rst                \
+       workbench.rst                      \
        $(NULL)
 
 GITIGNOREFILES = _build
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 7a11fe6..94d7623 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = \
+EXTRA_DIST =                                       \
        plugins/sample-plugin/sample-plugin.plugin \
        plugins/sample-plugin/sample_plugin.py
 
diff --git a/help/Makefile.am b/help/Makefile.am
index 36bad71..9fb9485 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -3,12 +3,12 @@
 HELP_ID = gnome-builder
 
 # Media files
-HELP_MEDIA = \
+HELP_MEDIA =              \
        figures/icon.png
 
 # Help pages
-HELP_FILES = \
-       index.page \
+HELP_FILES =              \
+       index.page        \
        introduction.page \
        legal.xml
 
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 0577dd3..23e5665 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -7,604 +7,604 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libide-1.0.la
 
 headersdir = $(includedir)/gnome-builder-@VERSION@/libide
-nobase_headers_DATA =                   \
-       $(libide_1_0_la_public_headers) \
-       $(builddir)/ide-enums.h         \
+nobase_headers_DATA =                                                       \
+       $(libide_1_0_la_public_headers)                                     \
+       $(builddir)/ide-enums.h                                             \
         $(NULL)
 
-libide_1_0_la_public_headers =                            \
-       ide-context.h                                     \
-       ide-debug.h                                       \
-       ide-global.h                                      \
-       ide-macros.h                                      \
-       ide-object.h                                      \
-       ide-service.h                                     \
-       ide-types.h                                       \
-       ide.h                                             \
-       application/ide-application-addin.h               \
-       application/ide-application-credits.h             \
-       application/ide-application-tool.h                \
-       application/ide-application.h                     \
-       buffers/ide-buffer-change-monitor.h               \
-       buffers/ide-buffer-manager.h                      \
-       buffers/ide-buffer.h                              \
-       buffers/ide-unsaved-file.h                        \
-       buffers/ide-unsaved-files.h                       \
-       buildconfig/ide-buildconfig-configuration.h       \
-       buildconfig/ide-buildconfig-configuration-provider.h \
-       buildsystem/ide-build-log.h                       \
-       buildsystem/ide-build-manager.h                   \
-       buildsystem/ide-build-pipeline.h                  \
-       buildsystem/ide-build-pipeline-addin.h            \
-       buildsystem/ide-build-stage.h                     \
-       buildsystem/ide-build-stage-launcher.h            \
-       buildsystem/ide-build-stage-mkdirs.h              \
-       buildsystem/ide-build-stage-transfer.h            \
-       buildsystem/ide-build-system.h                    \
-       buildsystem/ide-build-target.h                    \
-       buildsystem/ide-build-utils.h                     \
-       buildsystem/ide-configuration-manager.h           \
-       buildsystem/ide-configuration.h                   \
-       buildsystem/ide-configuration-provider.h          \
-       buildsystem/ide-environment-variable.h            \
-       buildsystem/ide-environment.h                     \
-       devices/ide-device-manager.h                      \
-       devices/ide-device-provider.h                     \
-       devices/ide-device.h                              \
-       diagnostics/ide-diagnostic-provider.h             \
-       diagnostics/ide-diagnostic.h                      \
-       diagnostics/ide-diagnostics-manager.h             \
-       diagnostics/ide-diagnostics.h                     \
-       diagnostics/ide-fixit.h                           \
-       diagnostics/ide-source-location.h                 \
-       diagnostics/ide-source-range.h                    \
-       directory/ide-directory-build-system.h            \
-       directory/ide-directory-vcs.h                     \
-       doap/ide-doap-person.h                            \
-       doap/ide-doap.h                                   \
-       editor/ide-editor-perspective.h                   \
-       editor/ide-editor-view-addin.h                    \
-       editor/ide-editor-view.h                          \
-       files/ide-file-settings.defs                      \
-       files/ide-file-settings.h                         \
-       files/ide-file.h                                  \
-       files/ide-indent-style.h                          \
-       genesis/ide-genesis-addin.h                       \
-       highlighting/ide-highlight-engine.h               \
-       highlighting/ide-highlight-index.h                \
-       highlighting/ide-highlighter.h                    \
-       history/ide-back-forward-item.h                   \
-       history/ide-back-forward-list.h                   \
-       langserv/ide-langserv-client.h                    \
-       langserv/ide-langserv-completion-provider.h       \
-       langserv/ide-langserv-diagnostic-provider.h       \
-       langserv/ide-langserv-highlighter.h               \
-       langserv/ide-langserv-rename-provider.h           \
-       langserv/ide-langserv-symbol-node.h               \
-       langserv/ide-langserv-symbol-resolver.h           \
-       langserv/ide-langserv-symbol-tree.h               \
-       local/ide-local-device.h                          \
-       logging/ide-log.h                                 \
-       plugins/ide-extension-adapter.h                   \
-       plugins/ide-extension-set-adapter.h               \
-       preferences/ide-preferences-addin.h               \
-       preferences/ide-preferences-bin.h                 \
-       preferences/ide-preferences-entry.h               \
-       preferences/ide-preferences-file-chooser-button.h \
-       preferences/ide-preferences-flow-box.h            \
-       preferences/ide-preferences-font-button.h         \
-       preferences/ide-preferences-group.h               \
-       preferences/ide-preferences-page.h                \
-       preferences/ide-preferences-spin-button.h         \
-       preferences/ide-preferences-switch.h              \
-       preferences/ide-preferences.h                     \
-       projects/ide-project-edit.h                       \
-       projects/ide-project-file.h                       \
-       projects/ide-project-files.h                      \
-       projects/ide-project-info.h                       \
-       projects/ide-project-item.h                       \
-       projects/ide-project-miner.h                      \
-       projects/ide-project.h                            \
-       projects/ide-recent-projects.h                    \
-       rename/ide-rename-provider.h                      \
-       runner/ide-run-button.h                           \
-       runner/ide-run-manager.h                          \
-       runner/ide-runner.h                               \
-       runner/ide-runner-addin.h                         \
-       runtimes/ide-runtime-manager.h                    \
-       runtimes/ide-runtime-provider.h                   \
-       runtimes/ide-runtime.h                            \
-       search/ide-omni-search-display.h                  \
-       search/ide-omni-search-entry.h                    \
-       search/ide-omni-search-group.h                    \
-       search/ide-omni-search-row.h                      \
-       search/ide-pattern-spec.h                         \
-       search/ide-search-context.h                       \
-       search/ide-search-engine.h                        \
-       search/ide-search-provider.h                      \
-       search/ide-search-reducer.h                       \
-       search/ide-search-result.h                        \
-       snippets/ide-source-snippet-chunk.h               \
-       snippets/ide-source-snippet-context.h             \
-       snippets/ide-source-snippet.h                     \
-       snippets/ide-source-snippets-manager.h            \
-       snippets/ide-source-snippets.h                    \
-       sourceview/ide-completion-item.h                  \
-       sourceview/ide-completion-provider.h              \
-       sourceview/ide-completion-results.h               \
-       sourceview/ide-completion-words.h                 \
-       sourceview/ide-indenter.h                         \
-       sourceview/ide-language.h                         \
-       sourceview/ide-source-map.h                       \
-       sourceview/ide-source-style-scheme.h              \
-       sourceview/ide-source-view-mode.h                 \
-       sourceview/ide-source-view.h                      \
-       subprocess/ide-subprocess.h                       \
-       subprocess/ide-subprocess-launcher.h              \
-       subprocess/ide-subprocess-supervisor.h            \
-       symbols/ide-symbol-node.h                         \
-       symbols/ide-symbol-resolver.h                     \
-       symbols/ide-symbol-tree.h                         \
-       symbols/ide-symbol.h                              \
-       symbols/ide-tags-builder.h                        \
-       template/ide-project-template.h                   \
-       template/ide-template-base.h                      \
-       template/ide-template-provider.h                  \
-       threading/ide-thread-pool.h                       \
-       transfers/ide-transfer-manager.h                  \
-       transfers/ide-transfer-row.h                      \
-       transfers/ide-transfer.h                          \
-       transfers/ide-transfer-button.h                   \
-       transfers/ide-transfers-button.h                  \
-       transfers/ide-transfers-progress-icon.h           \
-       tree/ide-tree-builder.h                           \
-       tree/ide-tree-node.h                              \
-       tree/ide-tree-types.h                             \
-       tree/ide-tree.h                                   \
-       util/ide-cairo.h                                  \
-       util/ide-dnd.h                                    \
-       util/ide-directory-reaper.h                       \
-       util/ide-file-manager.h                           \
-       util/ide-flatpak.h                                \
-       util/ide-glib.h                                   \
-       util/ide-gtk.h                                    \
-       util/ide-line-reader.h                            \
-       util/ide-list-inline.h                            \
-       util/ide-pango.h                                  \
-       util/ide-posix.h                                  \
-       util/ide-progress.h                               \
-       util/ide-rgba.h                                   \
-       util/ide-settings.h                               \
-       util/ide-uri.h                                    \
-       vcs/ide-vcs-config.h                              \
-       vcs/ide-vcs-initializer.h                         \
-       vcs/ide-vcs-uri.h                                 \
-       vcs/ide-vcs.h                                     \
-       workbench/ide-layout-grid.h                       \
-       workbench/ide-layout-pane.h                       \
-       workbench/ide-layout-stack-split.h                \
-       workbench/ide-layout-stack.h                      \
-       workbench/ide-layout-stack-addin.h                \
-       workbench/ide-layout-view.h                       \
-       workbench/ide-layout.h                            \
-       workbench/ide-omni-bar.h                          \
-       workbench/ide-perspective.h                       \
-       workbench/ide-workbench-addin.h                   \
-       workbench/ide-workbench-header-bar.h              \
-       workbench/ide-workbench.h                         \
-       workers/ide-worker.h                              \
+libide_1_0_la_public_headers =                                              \
+       ide-context.h                                                       \
+       ide-debug.h                                                         \
+       ide-global.h                                                        \
+       ide-macros.h                                                        \
+       ide-object.h                                                        \
+       ide-service.h                                                       \
+       ide-types.h                                                         \
+       ide.h                                                               \
+       application/ide-application-addin.h                                 \
+       application/ide-application-credits.h                               \
+       application/ide-application-tool.h                                  \
+       application/ide-application.h                                       \
+       buffers/ide-buffer-change-monitor.h                                 \
+       buffers/ide-buffer-manager.h                                        \
+       buffers/ide-buffer.h                                                \
+       buffers/ide-unsaved-file.h                                          \
+       buffers/ide-unsaved-files.h                                         \
+       buildconfig/ide-buildconfig-configuration.h                         \
+       buildconfig/ide-buildconfig-configuration-provider.h                \
+       buildsystem/ide-build-log.h                                         \
+       buildsystem/ide-build-manager.h                                     \
+       buildsystem/ide-build-pipeline.h                                    \
+       buildsystem/ide-build-pipeline-addin.h                              \
+       buildsystem/ide-build-stage.h                                       \
+       buildsystem/ide-build-stage-launcher.h                              \
+       buildsystem/ide-build-stage-mkdirs.h                                \
+       buildsystem/ide-build-stage-transfer.h                              \
+       buildsystem/ide-build-system.h                                      \
+       buildsystem/ide-build-target.h                                      \
+       buildsystem/ide-build-utils.h                                       \
+       buildsystem/ide-configuration-manager.h                             \
+       buildsystem/ide-configuration.h                                     \
+       buildsystem/ide-configuration-provider.h                            \
+       buildsystem/ide-environment-variable.h                              \
+       buildsystem/ide-environment.h                                       \
+       devices/ide-device-manager.h                                        \
+       devices/ide-device-provider.h                                       \
+       devices/ide-device.h                                                \
+       diagnostics/ide-diagnostic-provider.h                               \
+       diagnostics/ide-diagnostic.h                                        \
+       diagnostics/ide-diagnostics-manager.h                               \
+       diagnostics/ide-diagnostics.h                                       \
+       diagnostics/ide-fixit.h                                             \
+       diagnostics/ide-source-location.h                                   \
+       diagnostics/ide-source-range.h                                      \
+       directory/ide-directory-build-system.h                              \
+       directory/ide-directory-vcs.h                                       \
+       doap/ide-doap-person.h                                              \
+       doap/ide-doap.h                                                     \
+       editor/ide-editor-perspective.h                                     \
+       editor/ide-editor-view-addin.h                                      \
+       editor/ide-editor-view.h                                            \
+       files/ide-file-settings.defs                                        \
+       files/ide-file-settings.h                                           \
+       files/ide-file.h                                                    \
+       files/ide-indent-style.h                                            \
+       genesis/ide-genesis-addin.h                                         \
+       highlighting/ide-highlight-engine.h                                 \
+       highlighting/ide-highlight-index.h                                  \
+       highlighting/ide-highlighter.h                                      \
+       history/ide-back-forward-item.h                                     \
+       history/ide-back-forward-list.h                                     \
+       langserv/ide-langserv-client.h                                      \
+       langserv/ide-langserv-completion-provider.h                         \
+       langserv/ide-langserv-diagnostic-provider.h                         \
+       langserv/ide-langserv-highlighter.h                                 \
+       langserv/ide-langserv-rename-provider.h                             \
+       langserv/ide-langserv-symbol-node.h                                 \
+       langserv/ide-langserv-symbol-resolver.h                             \
+       langserv/ide-langserv-symbol-tree.h                                 \
+       local/ide-local-device.h                                            \
+       logging/ide-log.h                                                   \
+       plugins/ide-extension-adapter.h                                     \
+       plugins/ide-extension-set-adapter.h                                 \
+       preferences/ide-preferences-addin.h                                 \
+       preferences/ide-preferences-bin.h                                   \
+       preferences/ide-preferences-entry.h                                 \
+       preferences/ide-preferences-file-chooser-button.h                   \
+       preferences/ide-preferences-flow-box.h                              \
+       preferences/ide-preferences-font-button.h                           \
+       preferences/ide-preferences-group.h                                 \
+       preferences/ide-preferences-page.h                                  \
+       preferences/ide-preferences-spin-button.h                           \
+       preferences/ide-preferences-switch.h                                \
+       preferences/ide-preferences.h                                       \
+       projects/ide-project-edit.h                                         \
+       projects/ide-project-file.h                                         \
+       projects/ide-project-files.h                                        \
+       projects/ide-project-info.h                                         \
+       projects/ide-project-item.h                                         \
+       projects/ide-project-miner.h                                        \
+       projects/ide-project.h                                              \
+       projects/ide-recent-projects.h                                      \
+       rename/ide-rename-provider.h                                        \
+       runner/ide-run-button.h                                             \
+       runner/ide-run-manager.h                                            \
+       runner/ide-runner.h                                                 \
+       runner/ide-runner-addin.h                                           \
+       runtimes/ide-runtime-manager.h                                      \
+       runtimes/ide-runtime-provider.h                                     \
+       runtimes/ide-runtime.h                                              \
+       search/ide-omni-search-display.h                                    \
+       search/ide-omni-search-entry.h                                      \
+       search/ide-omni-search-group.h                                      \
+       search/ide-omni-search-row.h                                        \
+       search/ide-pattern-spec.h                                           \
+       search/ide-search-context.h                                         \
+       search/ide-search-engine.h                                          \
+       search/ide-search-provider.h                                        \
+       search/ide-search-reducer.h                                         \
+       search/ide-search-result.h                                          \
+       snippets/ide-source-snippet-chunk.h                                 \
+       snippets/ide-source-snippet-context.h                               \
+       snippets/ide-source-snippet.h                                       \
+       snippets/ide-source-snippets-manager.h                              \
+       snippets/ide-source-snippets.h                                      \
+       sourceview/ide-completion-item.h                                    \
+       sourceview/ide-completion-provider.h                                \
+       sourceview/ide-completion-results.h                                 \
+       sourceview/ide-completion-words.h                                   \
+       sourceview/ide-indenter.h                                           \
+       sourceview/ide-language.h                                           \
+       sourceview/ide-source-map.h                                         \
+       sourceview/ide-source-style-scheme.h                                \
+       sourceview/ide-source-view-mode.h                                   \
+       sourceview/ide-source-view.h                                        \
+       subprocess/ide-subprocess.h                                         \
+       subprocess/ide-subprocess-launcher.h                                \
+       subprocess/ide-subprocess-supervisor.h                              \
+       symbols/ide-symbol-node.h                                           \
+       symbols/ide-symbol-resolver.h                                       \
+       symbols/ide-symbol-tree.h                                           \
+       symbols/ide-symbol.h                                                \
+       symbols/ide-tags-builder.h                                          \
+       template/ide-project-template.h                                     \
+       template/ide-template-base.h                                        \
+       template/ide-template-provider.h                                    \
+       threading/ide-thread-pool.h                                         \
+       transfers/ide-transfer-manager.h                                    \
+       transfers/ide-transfer-row.h                                        \
+       transfers/ide-transfer.h                                            \
+       transfers/ide-transfer-button.h                                     \
+       transfers/ide-transfers-button.h                                    \
+       transfers/ide-transfers-progress-icon.h                             \
+       tree/ide-tree-builder.h                                             \
+       tree/ide-tree-node.h                                                \
+       tree/ide-tree-types.h                                               \
+       tree/ide-tree.h                                                     \
+       util/ide-cairo.h                                                    \
+       util/ide-dnd.h                                                      \
+       util/ide-directory-reaper.h                                         \
+       util/ide-file-manager.h                                             \
+       util/ide-flatpak.h                                                  \
+       util/ide-glib.h                                                     \
+       util/ide-gtk.h                                                      \
+       util/ide-line-reader.h                                              \
+       util/ide-list-inline.h                                              \
+       util/ide-pango.h                                                    \
+       util/ide-posix.h                                                    \
+       util/ide-progress.h                                                 \
+       util/ide-rgba.h                                                     \
+       util/ide-settings.h                                                 \
+       util/ide-uri.h                                                      \
+       vcs/ide-vcs-config.h                                                \
+       vcs/ide-vcs-initializer.h                                           \
+       vcs/ide-vcs-uri.h                                                   \
+       vcs/ide-vcs.h                                                       \
+       workbench/ide-layout-grid.h                                         \
+       workbench/ide-layout-pane.h                                         \
+       workbench/ide-layout-stack-split.h                                  \
+       workbench/ide-layout-stack.h                                        \
+       workbench/ide-layout-stack-addin.h                                  \
+       workbench/ide-layout-view.h                                         \
+       workbench/ide-layout.h                                              \
+       workbench/ide-omni-bar.h                                            \
+       workbench/ide-perspective.h                                         \
+       workbench/ide-workbench-addin.h                                     \
+       workbench/ide-workbench-header-bar.h                                \
+       workbench/ide-workbench.h                                           \
+       workers/ide-worker.h                                                \
        $(NULL)
 
-libide_1_0_la_public_sources =                            \
-       application/ide-application-addin.c               \
-       application/ide-application-tool.c                \
-       application/ide-application.c                     \
-       application/ide-application-open.c                \
-       buffers/ide-buffer-change-monitor.c               \
-       buffers/ide-buffer-manager.c                      \
-       buffers/ide-buffer.c                              \
-       buffers/ide-unsaved-file.c                        \
-       buffers/ide-unsaved-files.c                       \
-       buildconfig/ide-buildconfig-configuration.c       \
-       buildconfig/ide-buildconfig-configuration-provider.c \
-       buildsystem/ide-build-manager.c                   \
-       buildsystem/ide-build-pipeline.c                  \
-       buildsystem/ide-build-pipeline-addin.c            \
-       buildsystem/ide-build-stage.c                     \
-       buildsystem/ide-build-stage-launcher.c            \
-       buildsystem/ide-build-stage-mkdirs.c              \
-       buildsystem/ide-build-stage-transfer.c            \
-       buildsystem/ide-build-system.c                    \
-       buildsystem/ide-build-target.c                    \
-       buildsystem/ide-build-utils.c                     \
-       buildsystem/ide-configuration-manager.c           \
-       buildsystem/ide-configuration.c                   \
-       buildsystem/ide-configuration-provider.c          \
-       buildsystem/ide-environment-variable.c            \
-       buildsystem/ide-environment.c                     \
-       devices/ide-device-manager.c                      \
-       devices/ide-device-provider.c                     \
-       devices/ide-device.c                              \
-       diagnostics/ide-diagnostic-provider.c             \
-       diagnostics/ide-diagnostic.c                      \
-       diagnostics/ide-diagnostics-manager.c             \
-       diagnostics/ide-diagnostics.c                     \
-       diagnostics/ide-fixit.c                           \
-       diagnostics/ide-source-location.c                 \
-       diagnostics/ide-source-range.c                    \
-       directory/ide-directory-build-system.c            \
-       directory/ide-directory-plugin.c                  \
-       directory/ide-directory-vcs.c                     \
-       doap/ide-doap-person.c                            \
-       doap/ide-doap.c                                   \
-       editor/ide-editor-perspective.c                   \
-       editor/ide-editor-view-addin.c                    \
-       editor/ide-editor-view.c                          \
-       files/ide-file-settings.c                         \
-       files/ide-file-settings.defs                      \
-       files/ide-file.c                                  \
-       genesis/ide-genesis-addin.c                       \
-       highlighting/ide-highlight-engine.c               \
-       highlighting/ide-highlight-index.c                \
-       highlighting/ide-highlighter.c                    \
-       history/ide-back-forward-item.c                   \
-       history/ide-back-forward-list-load.c              \
-       history/ide-back-forward-list-save.c              \
-       history/ide-back-forward-list.c                   \
-       ide-context.c                                     \
-       ide-object.c                                      \
-       ide-service.c                                     \
-       ide.c                                             \
-       langserv/ide-langserv-client.c                    \
-       langserv/ide-langserv-completion-provider.c       \
-       langserv/ide-langserv-diagnostic-provider.c       \
-       langserv/ide-langserv-highlighter.c               \
-       langserv/ide-langserv-rename-provider.c           \
-       langserv/ide-langserv-symbol-node.c               \
-       langserv/ide-langserv-symbol-node-private.h       \
-       langserv/ide-langserv-symbol-resolver.c           \
-       langserv/ide-langserv-symbol-tree.c               \
-       langserv/ide-langserv-symbol-tree-private.h       \
-       local/ide-local-device.c                          \
-       logging/ide-log.c                                 \
-       plugins/ide-extension-adapter.c                   \
-       plugins/ide-extension-set-adapter.c               \
-       preferences/ide-preferences-addin.c               \
-       preferences/ide-preferences-entry.c               \
-       preferences/ide-preferences-file-chooser-button.c \
-       preferences/ide-preferences-flow-box.c            \
-       preferences/ide-preferences-font-button.c         \
-       preferences/ide-preferences-group.c               \
-       preferences/ide-preferences-page.c                \
-       preferences/ide-preferences-spin-button.c         \
-       preferences/ide-preferences-switch.c              \
-       preferences/ide-preferences.c                     \
-       projects/ide-project-edit.c                       \
-       projects/ide-project-file.c                       \
-       projects/ide-project-files.c                      \
-       projects/ide-project-info.c                       \
-       projects/ide-project-item.c                       \
-       projects/ide-project-miner.c                      \
-       projects/ide-project.c                            \
-       projects/ide-recent-projects.c                    \
-       rename/ide-rename-provider.c                      \
-       runner/ide-run-button.c                           \
-       runner/ide-run-manager.c                          \
-       runner/ide-runner.c                               \
-       runner/ide-runner-addin.c                         \
-       runtimes/ide-runtime-manager.c                    \
-       runtimes/ide-runtime-provider.c                   \
-       runtimes/ide-runtime.c                            \
-       search/ide-omni-search-display.c                  \
-       search/ide-omni-search-entry.c                    \
-       search/ide-omni-search-group.c                    \
-       search/ide-omni-search-row.c                      \
-       search/ide-pattern-spec.c                         \
-       search/ide-search-context.c                       \
-       search/ide-search-engine.c                        \
-       search/ide-search-provider.c                      \
-       search/ide-search-result.c                        \
-       snippets/ide-source-snippet-chunk.c               \
-       snippets/ide-source-snippet-context.c             \
-       snippets/ide-source-snippet.c                     \
-       snippets/ide-source-snippets-manager.c            \
-       snippets/ide-source-snippets.c                    \
-       sourceview/ide-completion-item.c                  \
-       sourceview/ide-completion-provider.c              \
-       sourceview/ide-completion-results.c               \
-       sourceview/ide-completion-words.c                 \
-       sourceview/ide-indenter.c                         \
-       sourceview/ide-language.c                         \
-       sourceview/ide-source-map.c                       \
-       sourceview/ide-source-style-scheme.c              \
-       sourceview/ide-source-view-mode.c                 \
-       sourceview/ide-source-view.c                      \
-       subprocess/ide-subprocess.c                       \
-       subprocess/ide-subprocess-launcher.c              \
-       subprocess/ide-subprocess-supervisor.c            \
-       symbols/ide-symbol-node.c                         \
-       symbols/ide-symbol-resolver.c                     \
-       symbols/ide-symbol-tree.c                         \
-       symbols/ide-symbol.c                              \
-       symbols/ide-tags-builder.c                        \
-       template/ide-project-template.c                   \
-       template/ide-template-base.c                      \
-       template/ide-template-provider.c                  \
-       threading/ide-thread-pool.c                       \
-       transfers/ide-transfer-manager.c                  \
-       transfers/ide-transfer-row.c                      \
-       transfers/ide-transfer.c                          \
-       transfers/ide-transfer-button.c                   \
-       transfers/ide-transfers-button.c                  \
-       transfers/ide-transfers-progress-icon.c           \
-       tree/ide-tree-builder.c                           \
-       tree/ide-tree-node.c                              \
-       tree/ide-tree.c                                   \
-       util/ide-cairo.c                                  \
-       util/ide-dnd.c                                    \
-       util/ide-directory-reaper.c                       \
-       util/ide-file-manager.c                           \
-       util/ide-flatpak.c                                \
-       util/ide-glib.c                                   \
-       util/ide-gtk.c                                    \
-       util/ide-line-reader.c                            \
-       util/ide-pango.c                                  \
-       util/ide-posix.c                                  \
-       util/ide-progress.c                               \
-       util/ide-rgba.c                                   \
-       util/ide-settings.c                               \
-       util/ide-uri.c                                    \
-       vcs/ide-vcs-config.c                              \
-       vcs/ide-vcs-initializer.c                         \
-       vcs/ide-vcs-uri.c                                 \
-       vcs/ide-vcs.c                                     \
-       workbench/ide-layout-grid.c                       \
-       workbench/ide-layout-pane.c                       \
-       workbench/ide-layout-stack.c                      \
-       workbench/ide-layout-stack-addin.c                \
-       workbench/ide-layout-view.c                       \
-       workbench/ide-layout.c                            \
-       workbench/ide-omni-bar.c                          \
-       workbench/ide-perspective.c                       \
-       workbench/ide-workbench-addin.c                   \
-       workbench/ide-workbench-header-bar.c              \
-       workbench/ide-workbench-open.c                    \
-       workbench/ide-workbench.c                         \
-       workers/ide-worker.c                              \
+libide_1_0_la_public_sources =                                              \
+       application/ide-application-addin.c                                 \
+       application/ide-application-tool.c                                  \
+       application/ide-application.c                                       \
+       application/ide-application-open.c                                  \
+       buffers/ide-buffer-change-monitor.c                                 \
+       buffers/ide-buffer-manager.c                                        \
+       buffers/ide-buffer.c                                                \
+       buffers/ide-unsaved-file.c                                          \
+       buffers/ide-unsaved-files.c                                         \
+       buildconfig/ide-buildconfig-configuration.c                         \
+       buildconfig/ide-buildconfig-configuration-provider.c                \
+       buildsystem/ide-build-manager.c                                     \
+       buildsystem/ide-build-pipeline.c                                    \
+       buildsystem/ide-build-pipeline-addin.c                              \
+       buildsystem/ide-build-stage.c                                       \
+       buildsystem/ide-build-stage-launcher.c                              \
+       buildsystem/ide-build-stage-mkdirs.c                                \
+       buildsystem/ide-build-stage-transfer.c                              \
+       buildsystem/ide-build-system.c                                      \
+       buildsystem/ide-build-target.c                                      \
+       buildsystem/ide-build-utils.c                                       \
+       buildsystem/ide-configuration-manager.c                             \
+       buildsystem/ide-configuration.c                                     \
+       buildsystem/ide-configuration-provider.c                            \
+       buildsystem/ide-environment-variable.c                              \
+       buildsystem/ide-environment.c                                       \
+       devices/ide-device-manager.c                                        \
+       devices/ide-device-provider.c                                       \
+       devices/ide-device.c                                                \
+       diagnostics/ide-diagnostic-provider.c                               \
+       diagnostics/ide-diagnostic.c                                        \
+       diagnostics/ide-diagnostics-manager.c                               \
+       diagnostics/ide-diagnostics.c                                       \
+       diagnostics/ide-fixit.c                                             \
+       diagnostics/ide-source-location.c                                   \
+       diagnostics/ide-source-range.c                                      \
+       directory/ide-directory-build-system.c                              \
+       directory/ide-directory-plugin.c                                    \
+       directory/ide-directory-vcs.c                                       \
+       doap/ide-doap-person.c                                              \
+       doap/ide-doap.c                                                     \
+       editor/ide-editor-perspective.c                                     \
+       editor/ide-editor-view-addin.c                                      \
+       editor/ide-editor-view.c                                            \
+       files/ide-file-settings.c                                           \
+       files/ide-file-settings.defs                                        \
+       files/ide-file.c                                                    \
+       genesis/ide-genesis-addin.c                                         \
+       highlighting/ide-highlight-engine.c                                 \
+       highlighting/ide-highlight-index.c                                  \
+       highlighting/ide-highlighter.c                                      \
+       history/ide-back-forward-item.c                                     \
+       history/ide-back-forward-list-load.c                                \
+       history/ide-back-forward-list-save.c                                \
+       history/ide-back-forward-list.c                                     \
+       ide-context.c                                                       \
+       ide-object.c                                                        \
+       ide-service.c                                                       \
+       ide.c                                                               \
+       langserv/ide-langserv-client.c                                      \
+       langserv/ide-langserv-completion-provider.c                         \
+       langserv/ide-langserv-diagnostic-provider.c                         \
+       langserv/ide-langserv-highlighter.c                                 \
+       langserv/ide-langserv-rename-provider.c                             \
+       langserv/ide-langserv-symbol-node.c                                 \
+       langserv/ide-langserv-symbol-node-private.h                         \
+       langserv/ide-langserv-symbol-resolver.c                             \
+       langserv/ide-langserv-symbol-tree.c                                 \
+       langserv/ide-langserv-symbol-tree-private.h                         \
+       local/ide-local-device.c                                            \
+       logging/ide-log.c                                                   \
+       plugins/ide-extension-adapter.c                                     \
+       plugins/ide-extension-set-adapter.c                                 \
+       preferences/ide-preferences-addin.c                                 \
+       preferences/ide-preferences-entry.c                                 \
+       preferences/ide-preferences-file-chooser-button.c                   \
+       preferences/ide-preferences-flow-box.c                              \
+       preferences/ide-preferences-font-button.c                           \
+       preferences/ide-preferences-group.c                                 \
+       preferences/ide-preferences-page.c                                  \
+       preferences/ide-preferences-spin-button.c                           \
+       preferences/ide-preferences-switch.c                                \
+       preferences/ide-preferences.c                                       \
+       projects/ide-project-edit.c                                         \
+       projects/ide-project-file.c                                         \
+       projects/ide-project-files.c                                        \
+       projects/ide-project-info.c                                         \
+       projects/ide-project-item.c                                         \
+       projects/ide-project-miner.c                                        \
+       projects/ide-project.c                                              \
+       projects/ide-recent-projects.c                                      \
+       rename/ide-rename-provider.c                                        \
+       runner/ide-run-button.c                                             \
+       runner/ide-run-manager.c                                            \
+       runner/ide-runner.c                                                 \
+       runner/ide-runner-addin.c                                           \
+       runtimes/ide-runtime-manager.c                                      \
+       runtimes/ide-runtime-provider.c                                     \
+       runtimes/ide-runtime.c                                              \
+       search/ide-omni-search-display.c                                    \
+       search/ide-omni-search-entry.c                                      \
+       search/ide-omni-search-group.c                                      \
+       search/ide-omni-search-row.c                                        \
+       search/ide-pattern-spec.c                                           \
+       search/ide-search-context.c                                         \
+       search/ide-search-engine.c                                          \
+       search/ide-search-provider.c                                        \
+       search/ide-search-result.c                                          \
+       snippets/ide-source-snippet-chunk.c                                 \
+       snippets/ide-source-snippet-context.c                               \
+       snippets/ide-source-snippet.c                                       \
+       snippets/ide-source-snippets-manager.c                              \
+       snippets/ide-source-snippets.c                                      \
+       sourceview/ide-completion-item.c                                    \
+       sourceview/ide-completion-provider.c                                \
+       sourceview/ide-completion-results.c                                 \
+       sourceview/ide-completion-words.c                                   \
+       sourceview/ide-indenter.c                                           \
+       sourceview/ide-language.c                                           \
+       sourceview/ide-source-map.c                                         \
+       sourceview/ide-source-style-scheme.c                                \
+       sourceview/ide-source-view-mode.c                                   \
+       sourceview/ide-source-view.c                                        \
+       subprocess/ide-subprocess.c                                         \
+       subprocess/ide-subprocess-launcher.c                                \
+       subprocess/ide-subprocess-supervisor.c                              \
+       symbols/ide-symbol-node.c                                           \
+       symbols/ide-symbol-resolver.c                                       \
+       symbols/ide-symbol-tree.c                                           \
+       symbols/ide-symbol.c                                                \
+       symbols/ide-tags-builder.c                                          \
+       template/ide-project-template.c                                     \
+       template/ide-template-base.c                                        \
+       template/ide-template-provider.c                                    \
+       threading/ide-thread-pool.c                                         \
+       transfers/ide-transfer-manager.c                                    \
+       transfers/ide-transfer-row.c                                        \
+       transfers/ide-transfer.c                                            \
+       transfers/ide-transfer-button.c                                     \
+       transfers/ide-transfers-button.c                                    \
+       transfers/ide-transfers-progress-icon.c                             \
+       tree/ide-tree-builder.c                                             \
+       tree/ide-tree-node.c                                                \
+       tree/ide-tree.c                                                     \
+       util/ide-cairo.c                                                    \
+       util/ide-dnd.c                                                      \
+       util/ide-directory-reaper.c                                         \
+       util/ide-file-manager.c                                             \
+       util/ide-flatpak.c                                                  \
+       util/ide-glib.c                                                     \
+       util/ide-gtk.c                                                      \
+       util/ide-line-reader.c                                              \
+       util/ide-pango.c                                                    \
+       util/ide-posix.c                                                    \
+       util/ide-progress.c                                                 \
+       util/ide-rgba.c                                                     \
+       util/ide-settings.c                                                 \
+       util/ide-uri.c                                                      \
+       vcs/ide-vcs-config.c                                                \
+       vcs/ide-vcs-initializer.c                                           \
+       vcs/ide-vcs-uri.c                                                   \
+       vcs/ide-vcs.c                                                       \
+       workbench/ide-layout-grid.c                                         \
+       workbench/ide-layout-pane.c                                         \
+       workbench/ide-layout-stack.c                                        \
+       workbench/ide-layout-stack-addin.c                                  \
+       workbench/ide-layout-view.c                                         \
+       workbench/ide-layout.c                                              \
+       workbench/ide-omni-bar.c                                            \
+       workbench/ide-perspective.c                                         \
+       workbench/ide-workbench-addin.c                                     \
+       workbench/ide-workbench-header-bar.c                                \
+       workbench/ide-workbench-open.c                                      \
+       workbench/ide-workbench.c                                           \
+       workers/ide-worker.c                                                \
        $(NULL)
 
-libide_1_0_la_SOURCES =                                   \
-       $(libide_1_0_la_public_headers)                   \
-       $(libide_1_0_la_public_sources)                   \
-       application/ide-application-actions.c             \
-       application/ide-application-actions.h             \
-       application/ide-application-command-line.c        \
-       application/ide-application-plugins.c             \
-       application/ide-application-private.h             \
-       application/ide-application-tests.c               \
-       application/ide-application-tests.h               \
-       buildconfig/ide-buildconfig-plugin.c              \
-       buildconfig/ide-buildconfig-pipeline-addin.c      \
-       buildconfig/ide-buildconfig-pipeline-addin.h      \
-       buildsystem/ide-build-log.c                       \
-       buildsystem/ide-build-log-private.h               \
-       buildsystem/ide-build-stage-private.h             \
-       buildui/ide-build-configuration-row.c             \
-       buildui/ide-build-configuration-row.h             \
-       buildui/ide-build-configuration-view.c            \
-       buildui/ide-build-configuration-view.h            \
-       buildui/ide-build-log-panel.c                     \
-       buildui/ide-build-log-panel.h                     \
-       buildui/ide-build-panel.c                         \
-       buildui/ide-build-panel.h                         \
-       buildui/ide-build-perspective.c                   \
-       buildui/ide-build-perspective.h                   \
-       buildui/ide-build-plugin.c                        \
-       buildui/ide-build-tool.c                          \
-       buildui/ide-build-tool.h                          \
-       buildui/ide-build-workbench-addin.c               \
-       buildui/ide-build-workbench-addin.h               \
-       buildui/ide-environment-editor-row.c              \
-       buildui/ide-environment-editor-row.h              \
-       buildui/ide-environment-editor.c                  \
-       buildui/ide-environment-editor.h                  \
-       editor/ide-editor-frame-actions.c                 \
-       editor/ide-editor-frame-actions.h                 \
-       editor/ide-editor-frame-private.h                 \
-       editor/ide-editor-frame.c                         \
-       editor/ide-editor-frame.h                         \
-       editor/ide-editor-map-bin.c                       \
-       editor/ide-editor-map-bin.h                       \
-       editor/ide-editor-plugin.c                        \
-       editor/ide-editor-layout-stack-addin.c            \
-       editor/ide-editor-layout-stack-addin.h            \
-       editor/ide-editor-layout-stack-controls.c         \
-       editor/ide-editor-layout-stack-controls.h         \
-       editor/ide-editor-print-operation.c               \
-       editor/ide-editor-print-operation.h               \
-       editor/ide-editor-spell-navigator.c               \
-       editor/ide-editor-spell-navigator.h               \
-       editor/ide-editor-spell-utils.c                   \
-       editor/ide-editor-spell-utils.h                   \
-       editor/ide-editor-spell-dict.c                    \
-       editor/ide-editor-spell-dict.h                    \
-       editor/ide-editor-spell-language-popover.c        \
-       editor/ide-editor-spell-language-popover.h        \
-       editor/ide-editor-spell-widget.c                  \
-       editor/ide-editor-spell-widget.h                  \
-       editor/ide-editor-tweak-widget.c                  \
-       editor/ide-editor-tweak-widget.h                  \
-       editor/ide-editor-view-actions.c                  \
-       editor/ide-editor-view-actions.h                  \
-       editor/ide-editor-view-addin-private.h            \
-       editor/ide-editor-view-private.h                  \
-       editor/ide-editor-workbench-addin.c               \
-       editor/ide-editor-workbench-addin.h               \
-       gconstructor.h                                    \
-       greeter/ide-greeter-perspective.c                 \
-       greeter/ide-greeter-perspective.h                 \
-       greeter/ide-greeter-project-row.c                 \
-       greeter/ide-greeter-project-row.h                 \
-       gsettings/ide-gsettings-file-settings.c           \
-       gsettings/ide-gsettings-file-settings.h           \
-       gsettings/ide-language-defaults.c                 \
-       gsettings/ide-language-defaults.h                 \
-       history/ide-back-forward-list-private.h           \
-       ide-internal.h                                    \
-       keybindings/ide-keybindings.c                     \
-       keybindings/ide-keybindings.h                     \
-       keybindings/ide-shortcuts-window.c                \
-       keybindings/ide-shortcuts-window.h                \
-       modelines/ide-modelines-file-settings.c           \
-       modelines/ide-modelines-file-settings.h           \
-       modelines/modeline-parser.c                       \
-       modelines/modeline-parser.h                       \
-       plugins/ide-extension-util.c                      \
-       plugins/ide-extension-util.h                      \
-       projects/ide-project-edit-private.h               \
-       preferences/ide-preferences-bin-private.h         \
-       preferences/ide-preferences-bin.c                 \
-       preferences/ide-preferences-builtin.c             \
-       preferences/ide-preferences-builtin.h             \
-       preferences/ide-preferences-group-private.h       \
-       preferences/ide-preferences-language-row.c        \
-       preferences/ide-preferences-language-row.h        \
-       preferences/ide-preferences-page-private.h        \
-       preferences/ide-preferences-perspective.c         \
-       preferences/ide-preferences-perspective.h         \
-       runner/ide-run-manager-private.h                  \
-       search/ide-search-reducer.c                       \
-       snippets/ide-source-snippet-completion-item.c     \
-       snippets/ide-source-snippet-completion-item.h     \
-       snippets/ide-source-snippet-completion-provider.c \
-       snippets/ide-source-snippet-completion-provider.h \
-       snippets/ide-source-snippet-parser.c              \
-       snippets/ide-source-snippet-parser.h              \
-       snippets/ide-source-snippet-private.h             \
-       sourceview/ide-line-change-gutter-renderer.c      \
-       sourceview/ide-line-change-gutter-renderer.h      \
-       sourceview/ide-line-diagnostics-gutter-renderer.c \
-       sourceview/ide-line-diagnostics-gutter-renderer.h \
-       sourceview/ide-source-iter.c                      \
-       sourceview/ide-source-iter.h                      \
-       sourceview/ide-source-view-capture.c              \
-       sourceview/ide-source-view-capture.h              \
-       sourceview/ide-source-view-movements.c            \
-       sourceview/ide-source-view-movements.h            \
-       sourceview/ide-text-iter.c                        \
-       sourceview/ide-text-iter.h                        \
-       sourceview/ide-text-util.c                        \
-       sourceview/ide-text-util.h                        \
-       subprocess/ide-breakout-subprocess.c              \
-       subprocess/ide-breakout-subprocess.h              \
-       subprocess/ide-breakout-subprocess-private.h      \
-       subprocess/ide-simple-subprocess.c                \
-       subprocess/ide-simple-subprocess.h                \
-       theatrics/ide-box-theatric.c                      \
-       theatrics/ide-box-theatric.h                      \
-       theming/ide-css-provider.c                        \
-       theming/ide-css-provider.h                        \
-       theming/ide-theme-manager.c                       \
-       theming/ide-theme-manager.h                       \
-       tree/ide-tree-private.h                           \
-       util/ide-async-helper.c                           \
-       util/ide-async-helper.h                           \
-       util/ide-battery-monitor.c                        \
-       util/ide-battery-monitor.h                        \
-       util/ide-doc-seq.c                                \
-       util/ide-doc-seq.h                                \
-       util/ide-gdk.c                                    \
-       util/ide-gdk.h                                    \
-       util/ide-ref-ptr.c                                \
-       util/ide-ref-ptr.h                                \
-       util/ide-window-settings.c                        \
-       util/ide-window-settings.h                        \
-       workbench/ide-layout-stack-actions.c              \
-       workbench/ide-layout-stack-actions.h              \
-       workbench/ide-layout-stack-private.h              \
-       workbench/ide-layout-tab-bar.c                    \
-       workbench/ide-layout-tab-bar.h                    \
-       workbench/ide-layout-tab-bar-private.h            \
-       workbench/ide-layout-tab.c                        \
-       workbench/ide-layout-tab.h                        \
-       workbench/ide-layout-tab-private.h                \
-       workbench/ide-omni-bar-row.c                      \
-       workbench/ide-omni-bar-row.h                      \
-       workbench/ide-perspective-menu-button.c           \
-       workbench/ide-perspective-menu-button.h           \
-       workbench/ide-workbench-actions.c                 \
-       workbench/ide-workbench-private.h                 \
-       workers/ide-worker-manager.c                      \
-       workers/ide-worker-manager.h                      \
-       workers/ide-worker-process.c                      \
-       workers/ide-worker-process.h                      \
+libide_1_0_la_SOURCES =                                                     \
+       $(libide_1_0_la_public_headers)                                     \
+       $(libide_1_0_la_public_sources)                                     \
+       application/ide-application-actions.c                               \
+       application/ide-application-actions.h                               \
+       application/ide-application-command-line.c                          \
+       application/ide-application-plugins.c                               \
+       application/ide-application-private.h                               \
+       application/ide-application-tests.c                                 \
+       application/ide-application-tests.h                                 \
+       buildconfig/ide-buildconfig-plugin.c                                \
+       buildconfig/ide-buildconfig-pipeline-addin.c                        \
+       buildconfig/ide-buildconfig-pipeline-addin.h                        \
+       buildsystem/ide-build-log.c                                         \
+       buildsystem/ide-build-log-private.h                                 \
+       buildsystem/ide-build-stage-private.h                               \
+       buildui/ide-build-configuration-row.c                               \
+       buildui/ide-build-configuration-row.h                               \
+       buildui/ide-build-configuration-view.c                              \
+       buildui/ide-build-configuration-view.h                              \
+       buildui/ide-build-log-panel.c                                       \
+       buildui/ide-build-log-panel.h                                       \
+       buildui/ide-build-panel.c                                           \
+       buildui/ide-build-panel.h                                           \
+       buildui/ide-build-perspective.c                                     \
+       buildui/ide-build-perspective.h                                     \
+       buildui/ide-build-plugin.c                                          \
+       buildui/ide-build-tool.c                                            \
+       buildui/ide-build-tool.h                                            \
+       buildui/ide-build-workbench-addin.c                                 \
+       buildui/ide-build-workbench-addin.h                                 \
+       buildui/ide-environment-editor-row.c                                \
+       buildui/ide-environment-editor-row.h                                \
+       buildui/ide-environment-editor.c                                    \
+       buildui/ide-environment-editor.h                                    \
+       editor/ide-editor-frame-actions.c                                   \
+       editor/ide-editor-frame-actions.h                                   \
+       editor/ide-editor-frame-private.h                                   \
+       editor/ide-editor-frame.c                                           \
+       editor/ide-editor-frame.h                                           \
+       editor/ide-editor-map-bin.c                                         \
+       editor/ide-editor-map-bin.h                                         \
+       editor/ide-editor-plugin.c                                          \
+       editor/ide-editor-layout-stack-addin.c                              \
+       editor/ide-editor-layout-stack-addin.h                              \
+       editor/ide-editor-layout-stack-controls.c                           \
+       editor/ide-editor-layout-stack-controls.h                           \
+       editor/ide-editor-print-operation.c                                 \
+       editor/ide-editor-print-operation.h                                 \
+       editor/ide-editor-spell-navigator.c                                 \
+       editor/ide-editor-spell-navigator.h                                 \
+       editor/ide-editor-spell-utils.c                                     \
+       editor/ide-editor-spell-utils.h                                     \
+       editor/ide-editor-spell-dict.c                                      \
+       editor/ide-editor-spell-dict.h                                      \
+       editor/ide-editor-spell-language-popover.c                          \
+       editor/ide-editor-spell-language-popover.h                          \
+       editor/ide-editor-spell-widget.c                                    \
+       editor/ide-editor-spell-widget.h                                    \
+       editor/ide-editor-tweak-widget.c                                    \
+       editor/ide-editor-tweak-widget.h                                    \
+       editor/ide-editor-view-actions.c                                    \
+       editor/ide-editor-view-actions.h                                    \
+       editor/ide-editor-view-addin-private.h                              \
+       editor/ide-editor-view-private.h                                    \
+       editor/ide-editor-workbench-addin.c                                 \
+       editor/ide-editor-workbench-addin.h                                 \
+       gconstructor.h                                                      \
+       greeter/ide-greeter-perspective.c                                   \
+       greeter/ide-greeter-perspective.h                                   \
+       greeter/ide-greeter-project-row.c                                   \
+       greeter/ide-greeter-project-row.h                                   \
+       gsettings/ide-gsettings-file-settings.c                             \
+       gsettings/ide-gsettings-file-settings.h                             \
+       gsettings/ide-language-defaults.c                                   \
+       gsettings/ide-language-defaults.h                                   \
+       history/ide-back-forward-list-private.h                             \
+       ide-internal.h                                                      \
+       keybindings/ide-keybindings.c                                       \
+       keybindings/ide-keybindings.h                                       \
+       keybindings/ide-shortcuts-window.c                                  \
+       keybindings/ide-shortcuts-window.h                                  \
+       modelines/ide-modelines-file-settings.c                             \
+       modelines/ide-modelines-file-settings.h                             \
+       modelines/modeline-parser.c                                         \
+       modelines/modeline-parser.h                                         \
+       plugins/ide-extension-util.c                                        \
+       plugins/ide-extension-util.h                                        \
+       projects/ide-project-edit-private.h                                 \
+       preferences/ide-preferences-bin-private.h                           \
+       preferences/ide-preferences-bin.c                                   \
+       preferences/ide-preferences-builtin.c                               \
+       preferences/ide-preferences-builtin.h                               \
+       preferences/ide-preferences-group-private.h                         \
+       preferences/ide-preferences-language-row.c                          \
+       preferences/ide-preferences-language-row.h                          \
+       preferences/ide-preferences-page-private.h                          \
+       preferences/ide-preferences-perspective.c                           \
+       preferences/ide-preferences-perspective.h                           \
+       runner/ide-run-manager-private.h                                    \
+       search/ide-search-reducer.c                                         \
+       snippets/ide-source-snippet-completion-item.c                       \
+       snippets/ide-source-snippet-completion-item.h                       \
+       snippets/ide-source-snippet-completion-provider.c                   \
+       snippets/ide-source-snippet-completion-provider.h                   \
+       snippets/ide-source-snippet-parser.c                                \
+       snippets/ide-source-snippet-parser.h                                \
+       snippets/ide-source-snippet-private.h                               \
+       sourceview/ide-line-change-gutter-renderer.c                        \
+       sourceview/ide-line-change-gutter-renderer.h                        \
+       sourceview/ide-line-diagnostics-gutter-renderer.c                   \
+       sourceview/ide-line-diagnostics-gutter-renderer.h                   \
+       sourceview/ide-source-iter.c                                        \
+       sourceview/ide-source-iter.h                                        \
+       sourceview/ide-source-view-capture.c                                \
+       sourceview/ide-source-view-capture.h                                \
+       sourceview/ide-source-view-movements.c                              \
+       sourceview/ide-source-view-movements.h                              \
+       sourceview/ide-text-iter.c                                          \
+       sourceview/ide-text-iter.h                                          \
+       sourceview/ide-text-util.c                                          \
+       sourceview/ide-text-util.h                                          \
+       subprocess/ide-breakout-subprocess.c                                \
+       subprocess/ide-breakout-subprocess.h                                \
+       subprocess/ide-breakout-subprocess-private.h                        \
+       subprocess/ide-simple-subprocess.c                                  \
+       subprocess/ide-simple-subprocess.h                                  \
+       theatrics/ide-box-theatric.c                                        \
+       theatrics/ide-box-theatric.h                                        \
+       theming/ide-css-provider.c                                          \
+       theming/ide-css-provider.h                                          \
+       theming/ide-theme-manager.c                                         \
+       theming/ide-theme-manager.h                                         \
+       tree/ide-tree-private.h                                             \
+       util/ide-async-helper.c                                             \
+       util/ide-async-helper.h                                             \
+       util/ide-battery-monitor.c                                          \
+       util/ide-battery-monitor.h                                          \
+       util/ide-doc-seq.c                                                  \
+       util/ide-doc-seq.h                                                  \
+       util/ide-gdk.c                                                      \
+       util/ide-gdk.h                                                      \
+       util/ide-ref-ptr.c                                                  \
+       util/ide-ref-ptr.h                                                  \
+       util/ide-window-settings.c                                          \
+       util/ide-window-settings.h                                          \
+       workbench/ide-layout-stack-actions.c                                \
+       workbench/ide-layout-stack-actions.h                                \
+       workbench/ide-layout-stack-private.h                                \
+       workbench/ide-layout-tab-bar.c                                      \
+       workbench/ide-layout-tab-bar.h                                      \
+       workbench/ide-layout-tab-bar-private.h                              \
+       workbench/ide-layout-tab.c                                          \
+       workbench/ide-layout-tab.h                                          \
+       workbench/ide-layout-tab-private.h                                  \
+       workbench/ide-omni-bar-row.c                                        \
+       workbench/ide-omni-bar-row.h                                        \
+       workbench/ide-perspective-menu-button.c                             \
+       workbench/ide-perspective-menu-button.h                             \
+       workbench/ide-workbench-actions.c                                   \
+       workbench/ide-workbench-private.h                                   \
+       workers/ide-worker-manager.c                                        \
+       workers/ide-worker-manager.h                                        \
+       workers/ide-worker-process.c                                        \
+       workers/ide-worker-process.h                                        \
        $(NULL)
 
-libide_1_0_la_includes =                             \
-       $(DEBUG_CFLAGS)                              \
-       -DPACKAGE_DATADIR="\"${datadir}\""           \
-       -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
-       -DPACKAGE_LIBDIR=\""${libdir}"\"             \
-       -DPACKAGE_LIBEXECDIR=\""${libexecdir}"\"     \
-       -DBUILDDIR=\""${abs_top_builddir}"\"         \
-       -DSRCDIR=\""${abs_top_srcdir}"\"             \
-       -I$(srcdir)                                  \
-       -I$(top_builddir)/contrib/jsonrpc-glib       \
-       -I$(top_builddir)/contrib/pnl                \
-       -I$(top_builddir)/contrib/tmpl               \
-       -I$(top_builddir)/data/icons/hicolor         \
-       -I$(top_builddir)/libide                     \
-       -I$(top_srcdir)/contrib/egg                  \
-       -I$(top_srcdir)/contrib/gd                   \
-       -I$(top_srcdir)/contrib/jsonrpc-glib         \
-       -I$(top_srcdir)/contrib/nautilus             \
-       -I$(top_srcdir)/contrib/pnl                  \
-       -I$(top_srcdir)/contrib/search               \
-       -I$(top_srcdir)/contrib/tmpl                 \
-       -I$(top_srcdir)/contrib/xml                  \
+libide_1_0_la_includes =                                                    \
+       $(DEBUG_CFLAGS)                                                     \
+       -DPACKAGE_DATADIR="\"${datadir}\""                                  \
+       -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\"                        \
+       -DPACKAGE_LIBDIR=\""${libdir}"\"                                    \
+       -DPACKAGE_LIBEXECDIR=\""${libexecdir}"\"                            \
+       -DBUILDDIR=\""${abs_top_builddir}"\"                                \
+       -DSRCDIR=\""${abs_top_srcdir}"\"                                    \
+       -I$(srcdir)                                                         \
+       -I$(top_builddir)/contrib/jsonrpc-glib                              \
+       -I$(top_builddir)/contrib/pnl                                       \
+       -I$(top_builddir)/contrib/tmpl                                      \
+       -I$(top_builddir)/data/icons/hicolor                                \
+       -I$(top_builddir)/libide                                            \
+       -I$(top_srcdir)/contrib/egg                                         \
+       -I$(top_srcdir)/contrib/gd                                          \
+       -I$(top_srcdir)/contrib/jsonrpc-glib                                \
+       -I$(top_srcdir)/contrib/nautilus                                    \
+       -I$(top_srcdir)/contrib/pnl                                         \
+       -I$(top_srcdir)/contrib/search                                      \
+       -I$(top_srcdir)/contrib/tmpl                                        \
+       -I$(top_srcdir)/contrib/xml                                         \
        $(NULL)
 
-libide_1_0_la_CPPFLAGS =          \
-       $(AM_CPPFLAGS)            \
-       $(libide_1_0_la_includes) \
+libide_1_0_la_CPPFLAGS =                                                    \
+       $(AM_CPPFLAGS)                                                      \
+       $(libide_1_0_la_includes)                                           \
        $(NULL)
 
-libide_1_0_la_CFLAGS =            \
-       $(AM_CFLAGS)              \
-       $(LIBIDE_CFLAGS)          \
-       $(OPTIMIZE_CFLAGS)        \
-       $(DEBUG_CFLAGS)           \
-       $(libide_1_0_la_includes) \
+libide_1_0_la_CFLAGS =                                                      \
+       $(AM_CFLAGS)                                                        \
+       $(LIBIDE_CFLAGS)                                                    \
+       $(OPTIMIZE_CFLAGS)                                                  \
+       $(DEBUG_CFLAGS)                                                     \
+       $(libide_1_0_la_includes)                                           \
        $(NULL)
 
-libide_1_0_la_CXXFLAGS =          \
-       $(AM_CXXFLAGS)            \
-       $(LIBIDE_CFLAGS)          \
-       $(libide_1_0_la_includes) \
-       $(OPTIMIZE_CFLAGS)        \
+libide_1_0_la_CXXFLAGS =                                                    \
+       $(AM_CXXFLAGS)                                                      \
+       $(LIBIDE_CFLAGS)                                                    \
+       $(libide_1_0_la_includes)                                           \
+       $(OPTIMIZE_CFLAGS)                                                  \
        $(NULL)
 
-libide_1_0_la_LDFLAGS =                         \
-       $(OPTIMIZE_LDFLAGS)                     \
-       -avoid-version                          \
-       -no-undefined                           \
-       --no-as-needed                          \
-       -export-symbols-regex '^(ide_|_ide_).*' \
+libide_1_0_la_LDFLAGS =                                                     \
+       $(OPTIMIZE_LDFLAGS)                                                 \
+       -avoid-version                                                      \
+       -no-undefined                                                       \
+       --no-as-needed                                                      \
+       -export-symbols-regex '^(ide_|_ide_).*'                             \
        $(NULL)
 
-libide_1_0_la_LIBADD =                                          \
-       $(LIBIDE_LIBS)                                          \
-       $(SHM_LIB)                                              \
-       -lm                                                     \
-       $(top_builddir)/data/icons/hicolor/libicons.la          \
-       $(top_builddir)/contrib/egg/libegg-private.la           \
-       $(top_builddir)/contrib/gd/libgd-private.la             \
-       $(top_builddir)/contrib/jsonrpc-glib/libjsonrpc-glib.la \
-       $(top_builddir)/contrib/nautilus/libnautilus.la         \
-       $(top_builddir)/contrib/pnl/libpanel-gtk.la             \
-       $(top_builddir)/contrib/search/libsearch.la             \
-       $(top_builddir)/contrib/tmpl/libtemplate-glib-1.0.la    \
-       $(top_builddir)/contrib/xml/libxml-private.la                   \
+libide_1_0_la_LIBADD =                                                      \
+       $(LIBIDE_LIBS)                                                      \
+       $(SHM_LIB)                                                          \
+       -lm                                                                 \
+       $(top_builddir)/data/icons/hicolor/libicons.la                      \
+       $(top_builddir)/contrib/egg/libegg-private.la                       \
+       $(top_builddir)/contrib/gd/libgd-private.la                         \
+       $(top_builddir)/contrib/jsonrpc-glib/libjsonrpc-glib.la             \
+       $(top_builddir)/contrib/nautilus/libnautilus.la                     \
+       $(top_builddir)/contrib/pnl/libpanel-gtk.la                         \
+       $(top_builddir)/contrib/search/libsearch.la                         \
+       $(top_builddir)/contrib/tmpl/libtemplate-glib-1.0.la                \
+       $(top_builddir)/contrib/xml/libxml-private.la                       \
        $(NULL)
 
 if ENABLE_WEBKIT
@@ -614,23 +614,23 @@ libide_1_0_la_LIBADD += $(WEBKIT_LIBS)
 endif
 
 
-libide_1_0_la_built_sources =     \
-       resources/ide-resources.c \
-       resources/ide-resources.h \
+libide_1_0_la_built_sources =                                               \
+       resources/ide-resources.c                                           \
+       resources/ide-resources.h                                           \
        $(NULL)
 
 
 if ENABLE_EDITORCONFIG
-libide_1_0_la_SOURCES +=                              \
-       editorconfig/editorconfig-glib.c              \
-       editorconfig/editorconfig-glib.h              \
-       editorconfig/ide-editorconfig-file-settings.c \
-       editorconfig/ide-editorconfig-file-settings.h \
+libide_1_0_la_SOURCES +=                                                    \
+       editorconfig/editorconfig-glib.c                                    \
+       editorconfig/editorconfig-glib.h                                    \
+       editorconfig/ide-editorconfig-file-settings.c                       \
+       editorconfig/ide-editorconfig-file-settings.h                       \
         $(NULL)
 
-libide_1_0_la_includes +=                       \
-       -I$(top_srcdir)/contrib/libeditorconfig \
-       -I$(srcdir)/editorconfig                \
+libide_1_0_la_includes +=                                                   \
+       -I$(top_srcdir)/contrib/libeditorconfig                             \
+       -I$(srcdir)/editorconfig                                            \
         $(NULL)
 
 libide_1_0_la_CFLAGS += -DENABLE_EDITORCONFIG
@@ -638,21 +638,21 @@ libide_1_0_la_LIBADD += $(top_builddir)/contrib/libeditorconfig/libeditorconfig.
 endif
 
 
-glib_enum_headers =                        \
-       buffers/ide-buffer.h               \
-       buildsystem/ide-build-log.h        \
-       buildsystem/ide-build-pipeline.h   \
-       devices/ide-device.h               \
-       diagnostics/ide-diagnostic.h       \
-       doap/ide-doap.h                    \
-       files/ide-indent-style.h           \
-       highlighting/ide-highlighter.h     \
-       runtimes/ide-runtime.h             \
-       sourceview/ide-source-view.h       \
-       symbols/ide-symbol.h               \
-       threading/ide-thread-pool.h        \
-       vcs/ide-vcs-config.h               \
-       workbench/ide-layout-stack-split.h \
+glib_enum_headers =                                                         \
+       buffers/ide-buffer.h                                                \
+       buildsystem/ide-build-log.h                                         \
+       buildsystem/ide-build-pipeline.h                                    \
+       devices/ide-device.h                                                \
+       diagnostics/ide-diagnostic.h                                        \
+       doap/ide-doap.h                                                     \
+       files/ide-indent-style.h                                            \
+       highlighting/ide-highlighter.h                                      \
+       runtimes/ide-runtime.h                                              \
+       sourceview/ide-source-view.h                                        \
+       symbols/ide-symbol.h                                                \
+       threading/ide-thread-pool.h                                         \
+       vcs/ide-vcs-config.h                                                \
+       workbench/ide-layout-stack-split.h                                  \
        $(NULL)
 
 glib_enum_h = ide-enums.h
@@ -667,11 +667,11 @@ glib_resources_xml = resources/libide.gresource.xml
 glib_resources_namespace = ide
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
-nodist_libide_1_0_la_SOURCES =    \
-       ide-enums.h               \
-       ide-enums.c               \
-       resources/ide-resources.c \
-       resources/ide-resources.h \
+nodist_libide_1_0_la_SOURCES =                                              \
+       ide-enums.h                                                         \
+       ide-enums.c                                                         \
+       resources/ide-resources.c                                           \
+       resources/ide-resources.h                                           \
        $(NULL)
 
 
@@ -680,36 +680,36 @@ if HAVE_INTROSPECTION
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS =                     \
-       --includedir=$(srcdir)                    \
-       --includedir=$(top_builddir)/contrib/egg  \
-       --includedir=$(top_builddir)/contrib/pnl  \
-       --includedir=$(top_builddir)/contrib/tmpl \
+INTROSPECTION_COMPILER_ARGS =                                               \
+       --includedir=$(srcdir)                                              \
+       --includedir=$(top_builddir)/contrib/egg                            \
+       --includedir=$(top_builddir)/contrib/pnl                            \
+       --includedir=$(top_builddir)/contrib/tmpl                           \
         $(NULL)
 
-introspection_sources =                 \
-       $(libide_1_0_la_public_sources) \
-       $(libide_1_0_la_public_headers) \
-       ide-enums.h                     \
-       ide-enums.c                     \
+introspection_sources =                                                     \
+       $(libide_1_0_la_public_sources)                                     \
+       $(libide_1_0_la_public_headers)                                     \
+       ide-enums.h                                                         \
+       ide-enums.c                                                         \
        $(NULL)
 
 Ide-1.0.gir: libide-1.0.la
 Ide_1_0_gir_INCLUDES = Gio-2.0 GtkSource-3.0 Peas-1.0 Json-1.0
 Ide_1_0_gir_CFLAGS = $(libide_1_0_la_CFLAGS)
-Ide_1_0_gir_LIBS =                                           \
-       libide-1.0.la                                        \
-       $(top_builddir)/contrib/egg/libegg-private.la        \
-       $(top_builddir)/contrib/pnl/libpanel-gtk.la          \
-       $(top_builddir)/contrib/tmpl/libtemplate-glib-1.0.la \
+Ide_1_0_gir_LIBS =                                                          \
+       libide-1.0.la                                                       \
+       $(top_builddir)/contrib/egg/libegg-private.la                       \
+       $(top_builddir)/contrib/pnl/libpanel-gtk.la                         \
+       $(top_builddir)/contrib/tmpl/libtemplate-glib-1.0.la                \
         $(NULL)
 Ide_1_0_gir_FILES = $(introspection_sources)
-Ide_1_0_gir_SCANNERFLAGS = \
+Ide_1_0_gir_SCANNERFLAGS =                                                  \
        --include-uninstalled=$(top_builddir)/contrib/egg/Egg-1.0.gir       \
        --include-uninstalled=$(top_builddir)/contrib/pnl/Pnl-1.0.gir       \
        --include-uninstalled=$(top_builddir)/contrib/tmpl/Template-1.0.gir \
-       --c-include="ide.h" \
-       -n Ide \
+       --c-include="ide.h"                                                 \
+       -n Ide                                                              \
        $(NULL)
 INTROSPECTION_GIRS += Ide-1.0.gir
 
@@ -730,28 +730,28 @@ libide-1.0.vapi: Ide-1.0.gir
 
 VAPIGEN_VAPIS = libide-1.0.vapi
 
-libide_1_0_vapi_DEPS =    \
-       gio-2.0           \
-       gtk+-3.0          \
-       gtksourceview-3.0 \
-       libpeas-1.0       \
-       panel-gtk         \
-       template-glib-1.0 \
-       egg-private       \
-       json-glib-1.0     \
+libide_1_0_vapi_DEPS =                                                      \
+       gio-2.0                                                             \
+       gtk+-3.0                                                            \
+       gtksourceview-3.0                                                   \
+       libpeas-1.0                                                         \
+       panel-gtk                                                           \
+       template-glib-1.0                                                   \
+       egg-private                                                         \
+       json-glib-1.0                                                       \
         $(NULL)
 
 libide_1_0_vapi_METADATADIRS = $(srcdir)
 libide_1_0_vapi_FILES = Ide-1.0.gir
-libide_1_0_vapi_VAPIDIRS =           \
-       $(top_builddir)/contrib/egg  \
-       $(top_builddir)/contrib/pnl  \
-       $(top_builddir)/contrib/tmpl \
+libide_1_0_vapi_VAPIDIRS =                                                  \
+       $(top_builddir)/contrib/egg                                         \
+       $(top_builddir)/contrib/pnl                                         \
+       $(top_builddir)/contrib/tmpl                                        \
         $(NULL)
-libide_1_0_vapi_GIRDIRS =            \
-       $(top_builddir)/contrib/egg  \
-       $(top_builddir)/contrib/pnl  \
-       $(top_builddir)/contrib/tmpl \
+libide_1_0_vapi_GIRDIRS =                                                   \
+       $(top_builddir)/contrib/egg                                         \
+       $(top_builddir)/contrib/pnl                                         \
+       $(top_builddir)/contrib/tmpl                                        \
         $(NULL)
 
 libide-1.0.deps: Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b92bae2..de3e8d6 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,46 +1,46 @@
-SUBDIRS = \
-       autotools \
-       autotools-templates \
-       beautifier \
-       c-pack \
-       cargo \
-       clang \
-       cmake \
-       color-picker \
-       command-bar \
-       comment-code \
-       create-project \
-       ctags \
-       devhelp \
-       file-search \
-       flatpak \
-       fpaste \
-       gcc \
-       gettext \
-       git \
-       gnome-code-assistance \
-       html-completion \
-       html-preview \
-       jedi \
-       jhbuild \
-       mingw \
-       meson \
-       meson-templates \
-       project-tree \
+SUBDIRS =                            \
+       autotools                    \
+       autotools-templates          \
+       beautifier                   \
+       c-pack                       \
+       cargo                        \
+       clang                        \
+       cmake                        \
+       color-picker                 \
+       command-bar                  \
+       comment-code                 \
+       create-project               \
+       ctags                        \
+       devhelp                      \
+       file-search                  \
+       flatpak                      \
+       fpaste                       \
+       gcc                          \
+       gettext                      \
+       git                          \
+       gnome-code-assistance        \
+       html-completion              \
+       html-preview                 \
+       jedi                         \
+       jhbuild                      \
+       mingw                        \
+       meson                        \
+       meson-templates              \
+       project-tree                 \
        python-gi-imports-completion \
-       python-pack \
-       quick-highlight \
-       rust-langserv \
-       rustup \
-       support \
-       symbol-tree \
-       sysmon \
-       sysprof \
-       terminal \
-       todo \
-       vala-pack \
-       valgrind \
-       xml-pack \
+       python-pack                  \
+       quick-highlight              \
+       rust-langserv                \
+       rustup                       \
+       support                      \
+       symbol-tree                  \
+       sysmon                       \
+       sysprof                      \
+       terminal                     \
+       todo                         \
+       vala-pack                    \
+       valgrind                     \
+       xml-pack                     \
        $(NULL)
 
 EXTRA_DIST = Makefile.plugin
diff --git a/plugins/autotools-templates/Makefile.am b/plugins/autotools-templates/Makefile.am
index 40e6c9a..28328ca 100644
--- a/plugins/autotools-templates/Makefile.am
+++ b/plugins/autotools-templates/Makefile.am
@@ -7,52 +7,52 @@ moduledir = $(libdir)/gnome-builder/plugins/autotools_templates
 dist_module_DATA = autotools_templates/__init__.py
 
 resourcedir = $(datadir)/gnome-builder/plugins/
-nobase_resource_DATA = \
-       autotools_templates/resources/CONTRIBUTING.md \
-       autotools_templates/resources/Makefile.am \
-       autotools_templates/resources/FlatpakManifestTemplate.json \
-       autotools_templates/resources/NEWS \
-       autotools_templates/resources/README.md \
-       autotools_templates/resources/autogen.sh \
-       autotools_templates/resources/configure.ac \
-       autotools_templates/resources/data/Makefile.am \
-       autotools_templates/resources/data/package.pc.in \
-       autotools_templates/resources/git.mk \
-       autotools_templates/resources/bin/Makefile.gnome-app \
-       autotools_templates/resources/bin/wrapper.py \
-       autotools_templates/resources/m4/Makefile.am \
-       autotools_templates/resources/m4/appstream-xml.m4 \
-       autotools_templates/resources/m4/ax_append_compile_flags.m4 \
-       autotools_templates/resources/m4/ax_append_flag.m4 \
-       autotools_templates/resources/m4/ax_check_compile_flag.m4 \
-       autotools_templates/resources/m4/ax_check_link_flag.m4 \
+nobase_resource_DATA =                                                 \
+       autotools_templates/resources/CONTRIBUTING.md                  \
+       autotools_templates/resources/Makefile.am                      \
+       autotools_templates/resources/FlatpakManifestTemplate.json     \
+       autotools_templates/resources/NEWS                             \
+       autotools_templates/resources/README.md                        \
+       autotools_templates/resources/autogen.sh                       \
+       autotools_templates/resources/configure.ac                     \
+       autotools_templates/resources/data/Makefile.am                 \
+       autotools_templates/resources/data/package.pc.in               \
+       autotools_templates/resources/git.mk                           \
+       autotools_templates/resources/bin/Makefile.gnome-app           \
+       autotools_templates/resources/bin/wrapper.py                   \
+       autotools_templates/resources/m4/Makefile.am                   \
+       autotools_templates/resources/m4/appstream-xml.m4              \
+       autotools_templates/resources/m4/ax_append_compile_flags.m4    \
+       autotools_templates/resources/m4/ax_append_flag.m4             \
+       autotools_templates/resources/m4/ax_check_compile_flag.m4      \
+       autotools_templates/resources/m4/ax_check_link_flag.m4         \
        autotools_templates/resources/m4/ax_compiler_flags_cxxflags.m4 \
-       autotools_templates/resources/m4/ax_compiler_vendor.m4 \
-       autotools_templates/resources/m4/ax_cxx_compile_stdcxx_11.m4 \
-       autotools_templates/resources/m4/ax_require_defined.m4 \
-       autotools_templates/resources/m4/glib-gettext.m4 \
-       autotools_templates/resources/m4/gsettings.m4 \
-       autotools_templates/resources/m4/intltool.m4 \
-       autotools_templates/resources/m4/introspection.m4 \
-       autotools_templates/resources/m4/libtool.m4 \
-       autotools_templates/resources/m4/pkg.m4 \
-       autotools_templates/resources/m4/vala.m4 \
-       autotools_templates/resources/m4/vapigen.m4 \
-       autotools_templates/resources/po/LINGUAS \
-       autotools_templates/resources/po/Makevars \
-       autotools_templates/resources/po/POTFILES.in \
-       autotools_templates/resources/src/__main__.py \
-       autotools_templates/resources/src/main.c \
-       autotools_templates/resources/src/main.cpp \
-       autotools_templates/resources/src/main.vala \
-       autotools_templates/resources/src/Makefile.empty \
-       autotools_templates/resources/src/Makefile.gnome-app \
-       autotools_templates/resources/src/Makefile.gnome-app-python \
-       autotools_templates/resources/src/Makefile.shared-library-c \
+       autotools_templates/resources/m4/ax_compiler_vendor.m4         \
+       autotools_templates/resources/m4/ax_cxx_compile_stdcxx_11.m4   \
+       autotools_templates/resources/m4/ax_require_defined.m4         \
+       autotools_templates/resources/m4/glib-gettext.m4               \
+       autotools_templates/resources/m4/gsettings.m4                  \
+       autotools_templates/resources/m4/intltool.m4                   \
+       autotools_templates/resources/m4/introspection.m4              \
+       autotools_templates/resources/m4/libtool.m4                    \
+       autotools_templates/resources/m4/pkg.m4                        \
+       autotools_templates/resources/m4/vala.m4                       \
+       autotools_templates/resources/m4/vapigen.m4                    \
+       autotools_templates/resources/po/LINGUAS                       \
+       autotools_templates/resources/po/Makevars                      \
+       autotools_templates/resources/po/POTFILES.in                   \
+       autotools_templates/resources/src/__main__.py                  \
+       autotools_templates/resources/src/main.c                       \
+       autotools_templates/resources/src/main.cpp                     \
+       autotools_templates/resources/src/main.vala                    \
+       autotools_templates/resources/src/Makefile.empty               \
+       autotools_templates/resources/src/Makefile.gnome-app           \
+       autotools_templates/resources/src/Makefile.gnome-app-python    \
+       autotools_templates/resources/src/Makefile.shared-library-c    \
        autotools_templates/resources/src/Makefile.shared-library-vala \
-       autotools_templates/resources/src/package-version.h.in \
-       autotools_templates/resources/src/package.h \
-       autotools_templates/resources/src/package.vala \
+       autotools_templates/resources/src/package-version.h.in         \
+       autotools_templates/resources/src/package.h                    \
+       autotools_templates/resources/src/package.vala                 \
        $(NULL)
 
 EXTRA_DIST = $(nobase_resource_DATA)
diff --git a/plugins/autotools-templates/autotools_templates/resources/Makefile.am 
b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
index aa8ae22..74829c4 100644
--- a/plugins/autotools-templates/autotools_templates/resources/Makefile.am
+++ b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
@@ -3,16 +3,16 @@ SUBDIRS = data{{if enable_c}} src{{end}}{{if enable_python}} {{name_}} bin{{end}
 EXTRA_DIST = AUTHORS
 
 AUTHORS:
-       $(AM_V_GEN)if test -d "$(srcdir)/.git"; \
-       then \
-               echo Creating $@ && \
-               ( cd "$(top_srcdir)" && \
-                 echo '# Generated by Makefile. Do not edit.'; echo; \
-                 git log --no-merges --pretty=format:"%an" $(SUBDIRS) \
-                 | sort | uniq ) > $@.tmp \
-               && mv -f $@.tmp $@ \
-               || ( rm -f $@.tmp ; \
-                    echo Failed to generate $@ >&2 ); \
+       $(AM_V_GEN)if test -d "$(srcdir)/.git";                                                               
                    \
+       then                                                                                                  
                    \
+               echo Creating $@ &&                                                                           
                    \
+               ( cd "$(top_srcdir)" &&                                                                       
                    \
+                 echo '# Generated by Makefile. Do not edit.'; echo;                                         
                      \
+                 git log --no-merges --pretty=format:"%an" $(SUBDIRS)                                        
                      \
+                 | sort | uniq ) > $@.tmp                                                                    
                      \
+               && mv -f $@.tmp $@                                                                            
                    \
+               || ( rm -f $@.tmp ;                                                                           
                    \
+                    echo Failed to generate $@ >&2 );                                                        
                         \
        else touch $@; fi
 
 # Generate the ChangeLog.
@@ -24,30 +24,30 @@ pycheck_dirs = bin {{name_}}
 
 check-local:
        @echo "  CHECK  Pyflakes" $(pycheck_dirs)
-       @if type pyflakes >/dev/null 2>&1; then \
-               (cd $(abs_top_srcdir) && pyflakes $(pycheck_dirs) ); \
-       else echo "skipped, pyflakes not installed"; \
+       @if type pyflakes >/dev/null 2>&1; then                                                               
                    \
+               (cd $(abs_top_srcdir) && pyflakes $(pycheck_dirs) );                                          
                    \
+       else echo "skipped, pyflakes not installed";                                                          
                    \
        fi
-       @if test -z "$$SKIP_PEP8"; then \
-               echo "  CHECK  PEP8"; \
-               if type pep8 >/dev/null 2>&1; then \
+       @if test -z "$$SKIP_PEP8"; then                                                                       
                    \
+               echo "  CHECK  PEP8";                                                                         
                    \
+               if type pep8 >/dev/null 2>&1; then                                                            
                    \
                        (cd $(abs_top_srcdir) && pep8 --ignore=E501,E123,E124,E402,E731 --repeat 
--show-source $(pycheck_dirs) ); \
-               else echo "skipped, pep8 not installed"; \
-               fi; \
+               else echo "skipped, pep8 not installed";                                                      
                    \
+               fi;                                                                                           
                    \
        fi
 {{end}}
 
-GITIGNOREFILES = \
-       **/*.swp \
-       *.o \
-       aclocal.m4 \
-       build-aux \
-       ChangeLog \
-       config \
-       config.h.in \
-       gtk-doc.m4 \
-       gtk-doc.make \
-       INSTALL \
+GITIGNOREFILES =                                                                                             
                     \
+       **/*.swp                                                                                              
                    \
+       *.o                                                                                                   
                    \
+       aclocal.m4                                                                                            
                    \
+       build-aux                                                                                             
                    \
+       ChangeLog                                                                                             
                    \
+       config                                                                                                
                    \
+       config.h.in                                                                                           
                    \
+       gtk-doc.m4                                                                                            
                    \
+       gtk-doc.make                                                                                          
                    \
+       INSTALL                                                                                               
                    \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index b9af5a5..4cba934 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -4,26 +4,26 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libautotools-plugin.la
 dist_plugin_DATA = autotools.plugin
 
-libautotools_plugin_la_SOURCES = \
-       autotools-plugin.c \
+libautotools_plugin_la_SOURCES =          \
+       autotools-plugin.c                \
        ide-autotools-application-addin.c \
        ide-autotools-application-addin.h \
-       ide-autotools-autogen-stage.c \
-       ide-autotools-autogen-stage.h \
-       ide-autotools-build-system.c \
-       ide-autotools-build-system.h \
-       ide-autotools-build-target.c \
-       ide-autotools-build-target.h \
-       ide-autotools-makecache-stage.c \
-       ide-autotools-makecache-stage.h \
-       ide-autotools-pipeline-addin.c \
-       ide-autotools-pipeline-addin.h \
-       ide-autotools-project-miner.c \
-       ide-autotools-project-miner.h \
-       ide-makecache.c \
-       ide-makecache.h \
-       ide-makecache-target.c \
-       ide-makecache-target.h \
+       ide-autotools-autogen-stage.c     \
+       ide-autotools-autogen-stage.h     \
+       ide-autotools-build-system.c      \
+       ide-autotools-build-system.h      \
+       ide-autotools-build-target.c      \
+       ide-autotools-build-target.h      \
+       ide-autotools-makecache-stage.c   \
+       ide-autotools-makecache-stage.h   \
+       ide-autotools-pipeline-addin.c    \
+       ide-autotools-pipeline-addin.h    \
+       ide-autotools-project-miner.c     \
+       ide-autotools-project-miner.h     \
+       ide-makecache.c                   \
+       ide-makecache.h                   \
+       ide-makecache-target.c            \
+       ide-makecache-target.h            \
        $(NULL)
 
 libautotools_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/beautifier/Makefile.am b/plugins/beautifier/Makefile.am
index 5a927f3..8643d4e 100644
--- a/plugins/beautifier/Makefile.am
+++ b/plugins/beautifier/Makefile.am
@@ -14,42 +14,42 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libbeautifier-plugin.la
 dist_plugin_DATA = beautifier.plugin
 
-libbeautifier_plugin_la_SOURCES =          \
-       gb-beautifier-config.c             \
-       gb-beautifier-config.h             \
-       gb-beautifier-helper.c             \
-       gb-beautifier-helper.h             \
-       gb-beautifier-plugin.c             \
-       gb-beautifier-private.h            \
-       gb-beautifier-process.c            \
-       gb-beautifier-process.h            \
-       gb-beautifier-workbench-addin.c    \
-       gb-beautifier-workbench-addin.h    \
+libbeautifier_plugin_la_SOURCES =                                                                    \
+       gb-beautifier-config.c                                                                       \
+       gb-beautifier-config.h                                                                       \
+       gb-beautifier-helper.c                                                                       \
+       gb-beautifier-helper.h                                                                       \
+       gb-beautifier-plugin.c                                                                       \
+       gb-beautifier-private.h                                                                      \
+       gb-beautifier-process.c                                                                      \
+       gb-beautifier-process.h                                                                      \
+       gb-beautifier-workbench-addin.c                                                              \
+       gb-beautifier-workbench-addin.h                                                              \
        $(NULL)
 
-nodist_libbeautifier_plugin_la_SOURCES =   \
-       gb-beautifier-resources.c          \
-       gb-beautifier-resources.h          \
+nodist_libbeautifier_plugin_la_SOURCES =                                                             \
+       gb-beautifier-resources.c                                                                    \
+       gb-beautifier-resources.h                                                                    \
        $(NULL)
 
 resourcedir = $(datadir)/gnome-builder/plugins/beautifier_plugin
-nobase_resource_DATA =                 \
-       data/global.ini                \
-       data/c/config.ini              \
-       data/c/gnu-indent.cfg          \
-       data/c/k&r.cfg                 \
-       data/c/linux-kernel.cfg        \
-       data/c-sharp/config.ini        \
-       data/c-sharp/mono.cfg          \
-       data/d/config.ini              \
-       data/d/d.cfg                   \
-       data/html/config.ini           \
-       data/html/tidy-autoindent.cfg  \
-       data/html/tidy-indent.cfg      \
-       data/objc/config.ini           \
-       data/objc/objc.cfg             \
-       data/python/config.ini         \
-       data/xml/config.ini            \
+nobase_resource_DATA =                                                                               \
+       data/global.ini                                                                              \
+       data/c/config.ini                                                                            \
+       data/c/gnu-indent.cfg                                                                        \
+       data/c/k&r.cfg                                                                               \
+       data/c/linux-kernel.cfg                                                                      \
+       data/c-sharp/config.ini                                                                      \
+       data/c-sharp/mono.cfg                                                                        \
+       data/d/config.ini                                                                            \
+       data/d/d.cfg                                                                                 \
+       data/html/config.ini                                                                         \
+       data/html/tidy-autoindent.cfg                                                                \
+       data/html/tidy-indent.cfg                                                                    \
+       data/objc/config.ini                                                                         \
+       data/objc/objc.cfg                                                                           \
+       data/python/config.ini                                                                       \
+       data/xml/config.ini                                                                          \
        $(NULL)
 
 EXTRA_DIST += $(nobase_resource_DATA)
diff --git a/plugins/c-pack/Makefile.am b/plugins/c-pack/Makefile.am
index 77f672f..e6eba38 100644
--- a/plugins/c-pack/Makefile.am
+++ b/plugins/c-pack/Makefile.am
@@ -6,12 +6,12 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libc-pack-plugin.la
 dist_plugin_DATA = c-pack.plugin
 
-libc_pack_plugin_la_SOURCES = \
-       c-pack-plugin.c \
-       c-parse-helper.c \
-       c-parse-helper.h \
-       ide-c-indenter.c \
-       ide-c-indenter.h \
+libc_pack_plugin_la_SOURCES =   \
+       c-pack-plugin.c         \
+       c-parse-helper.c        \
+       c-parse-helper.h        \
+       ide-c-indenter.c        \
+       ide-c-indenter.h        \
        ide-c-format-provider.c \
        ide-c-format-provider.h \
        $(NULL)
diff --git a/plugins/cargo/Makefile.am b/plugins/cargo/Makefile.am
index 6ed1f1b..3bf8eae 100644
--- a/plugins/cargo/Makefile.am
+++ b/plugins/cargo/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_CARGO_PLUGIN
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
-dist_plugin_DATA = \
+dist_plugin_DATA =   \
        cargo.plugin \
        cargo_plugin.py
 
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index cd20fa7..c586d21 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -6,30 +6,30 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libclang-plugin.la
 dist_plugin_DATA = clang.plugin
 
-libclang_plugin_la_SOURCES = \
-       ide-clang-completion-item.c \
-       ide-clang-completion-item.h \
+libclang_plugin_la_SOURCES =                \
+       ide-clang-completion-item.c         \
+       ide-clang-completion-item.h         \
        ide-clang-completion-item-private.h \
-       ide-clang-completion-provider.c \
-       ide-clang-completion-provider.h \
-       ide-clang-diagnostic-provider.c \
-       ide-clang-diagnostic-provider.h \
-       ide-clang-highlighter.c \
-       ide-clang-highlighter.h \
-       ide-clang-preferences-addin.c \
-       ide-clang-preferences-addin.h \
-       ide-clang-private.h \
-       ide-clang-service.c \
-       ide-clang-service.h \
-       ide-clang-symbol-node.c \
-       ide-clang-symbol-node.h \
-       ide-clang-symbol-resolver.c \
-       ide-clang-symbol-resolver.h \
-       ide-clang-symbol-tree.c \
-       ide-clang-symbol-tree.h \
-       ide-clang-translation-unit.c \
-       ide-clang-translation-unit.h \
-       clang-plugin.c \
+       ide-clang-completion-provider.c     \
+       ide-clang-completion-provider.h     \
+       ide-clang-diagnostic-provider.c     \
+       ide-clang-diagnostic-provider.h     \
+       ide-clang-highlighter.c             \
+       ide-clang-highlighter.h             \
+       ide-clang-preferences-addin.c       \
+       ide-clang-preferences-addin.h       \
+       ide-clang-private.h                 \
+       ide-clang-service.c                 \
+       ide-clang-service.h                 \
+       ide-clang-symbol-node.c             \
+       ide-clang-symbol-node.h             \
+       ide-clang-symbol-resolver.c         \
+       ide-clang-symbol-resolver.h         \
+       ide-clang-symbol-tree.c             \
+       ide-clang-symbol-tree.h             \
+       ide-clang-translation-unit.c        \
+       ide-clang-translation-unit.h        \
+       clang-plugin.c                      \
        $(NULL)
 
 libclang_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(CLANG_CFLAGS)
diff --git a/plugins/color-picker/Makefile.am b/plugins/color-picker/Makefile.am
index f5c77ef..5a716d4 100644
--- a/plugins/color-picker/Makefile.am
+++ b/plugins/color-picker/Makefile.am
@@ -9,39 +9,39 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libcolor-picker-plugin.la
 dist_plugin_DATA = color-picker.plugin
 
-libcolor_picker_plugin_la_SOURCES =               \
-       gb-color-picker-helper.c                  \
-       gb-color-picker-helper.h                  \
-       gb-color-picker-plugin.c                  \
-       gb-color-picker-document-monitor.c        \
-       gb-color-picker-document-monitor.h        \
-       gb-color-picker-prefs.c                   \
-       gb-color-picker-prefs.h                   \
-       gb-color-picker-prefs-list.c              \
-       gb-color-picker-prefs-palette-list.h      \
-       gb-color-picker-prefs-palette-list.c      \
-       gb-color-picker-prefs-list.h              \
-       gb-color-picker-prefs-palette-row.c       \
-       gb-color-picker-prefs-palette-row.h       \
-       gb-color-picker-private.h                 \
-       gb-color-picker-workbench-addin.c         \
-       gb-color-picker-workbench-addin.h         \
-       gb-color-picker-workbench-addin-private.h \
+libcolor_picker_plugin_la_SOURCES =                                         \
+       gb-color-picker-helper.c                                            \
+       gb-color-picker-helper.h                                            \
+       gb-color-picker-plugin.c                                            \
+       gb-color-picker-document-monitor.c                                  \
+       gb-color-picker-document-monitor.h                                  \
+       gb-color-picker-prefs.c                                             \
+       gb-color-picker-prefs.h                                             \
+       gb-color-picker-prefs-list.c                                        \
+       gb-color-picker-prefs-palette-list.h                                \
+       gb-color-picker-prefs-palette-list.c                                \
+       gb-color-picker-prefs-list.h                                        \
+       gb-color-picker-prefs-palette-row.c                                 \
+       gb-color-picker-prefs-palette-row.h                                 \
+       gb-color-picker-private.h                                           \
+       gb-color-picker-workbench-addin.c                                   \
+       gb-color-picker-workbench-addin.h                                   \
+       gb-color-picker-workbench-addin-private.h                           \
        $(NULL)
 
-libcolor_picker_plugin_la_includes =   \
-       -I$(top_srcdir)/contrib/gstyle \
+libcolor_picker_plugin_la_includes =                                        \
+       -I$(top_srcdir)/contrib/gstyle                                      \
        $(NULL)
 
-nodist_libcolor_picker_plugin_la_SOURCES = \
-       gb-color-picker-resources.c        \
-       gb-color-picker-resources.h        \
+nodist_libcolor_picker_plugin_la_SOURCES =                                  \
+       gb-color-picker-resources.c                                         \
+       gb-color-picker-resources.h                                         \
        $(NULL)
 
 libcolor_picker_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(GSTYLE_CFLAGS)
-libcolor_picker_plugin_la_LIBADD = \
-       $(GSTYLE_LIBS) \
-       $(top_builddir)/contrib/gstyle/libgstyle-private.la \
+libcolor_picker_plugin_la_LIBADD =                                          \
+       $(GSTYLE_LIBS)                                                      \
+       $(top_builddir)/contrib/gstyle/libgstyle-private.la                 \
        $(NULL)
 
 libcolor_picker_plugin_la_LDFLAGS = $(PLUGIN_LDFLAGS)
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index f3f426c..22292fb 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -9,29 +9,29 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libcommand-bar.la
 dist_plugin_DATA = command-bar.plugin
 
-libcommand_bar_la_SOURCES = \
-       gb-command-bar-resources.c \
-       gb-command-bar-resources.h \
-       gb-command-bar.c \
-       gb-command-bar.h \
+libcommand_bar_la_SOURCES =           \
+       gb-command-bar-resources.c    \
+       gb-command-bar-resources.h    \
+       gb-command-bar.c              \
+       gb-command-bar.h              \
        gb-command-gaction-provider.c \
        gb-command-gaction-provider.h \
-       gb-command-gaction.c \
-       gb-command-gaction.h \
-       gb-command-manager.c \
-       gb-command-manager.h \
-       gb-command-provider.c \
-       gb-command-provider.h \
-       gb-command-result.c \
-       gb-command-result.h \
-       gb-command-vim-provider.c \
-       gb-command-vim-provider.h \
-       gb-command-vim.c \
-       gb-command-vim.h \
-       gb-command.c \
-       gb-command.h \
-       gb-vim.c \
-       gb-vim.h \
+       gb-command-gaction.c          \
+       gb-command-gaction.h          \
+       gb-command-manager.c          \
+       gb-command-manager.h          \
+       gb-command-provider.c         \
+       gb-command-provider.h         \
+       gb-command-result.c           \
+       gb-command-result.h           \
+       gb-command-vim-provider.c     \
+       gb-command-vim-provider.h     \
+       gb-command-vim.c              \
+       gb-command-vim.h              \
+       gb-command.c                  \
+       gb-command.h                  \
+       gb-vim.c                      \
+       gb-vim.h                      \
        $(NULL)
 
 libcommand_bar_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/comment-code/Makefile.am b/plugins/comment-code/Makefile.am
index 616b811..003e624 100644
--- a/plugins/comment-code/Makefile.am
+++ b/plugins/comment-code/Makefile.am
@@ -9,14 +9,14 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libcomment-code-plugin.la
 dist_plugin_DATA = comment-code.plugin
 
-libcomment_code_plugin_la_SOURCES = \
-       gbp-comment-code-plugin.c \
-       gbp-comment-code-view-addin.c \
-       gbp-comment-code-view-addin.h \
+libcomment_code_plugin_la_SOURCES =        \
+       gbp-comment-code-plugin.c          \
+       gbp-comment-code-view-addin.c      \
+       gbp-comment-code-view-addin.h      \
        $(NULL)
 
 nodist_libcomment_code_plugin_la_SOURCES = \
-       gbp-comment-code-resources.c \
+       gbp-comment-code-resources.c       \
        gbp-comment-code-resources.h
 
 libcomment_code_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/create-project/Makefile.am b/plugins/create-project/Makefile.am
index 927c53f..d843379 100644
--- a/plugins/create-project/Makefile.am
+++ b/plugins/create-project/Makefile.am
@@ -9,20 +9,20 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libcreate-project-plugin.la
 dist_plugin_DATA = create-project.plugin
 
-libcreate_project_plugin_la_SOURCES = \
-       gbp-create-project-genesis-addin.c \
-       gbp-create-project-genesis-addin.h \
-       gbp-create-project-plugin.c \
-       gbp-create-project-template-icon.c \
-       gbp-create-project-template-icon.h \
-       gbp-create-project-tool.c \
-       gbp-create-project-tool.h \
-       gbp-create-project-widget.c \
-       gbp-create-project-widget.h \
+libcreate_project_plugin_la_SOURCES =        \
+       gbp-create-project-genesis-addin.c   \
+       gbp-create-project-genesis-addin.h   \
+       gbp-create-project-plugin.c          \
+       gbp-create-project-template-icon.c   \
+       gbp-create-project-template-icon.h   \
+       gbp-create-project-tool.c            \
+       gbp-create-project-tool.h            \
+       gbp-create-project-widget.c          \
+       gbp-create-project-widget.h          \
        $(NULL)
 
 nodist_libcreate_project_plugin_la_SOURCES = \
-       gbp-create-project-resources.c \
+       gbp-create-project-resources.c       \
        gbp-create-project-resources.h
 
 libcreate_project_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index c76e3e7..25436bf 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -4,29 +4,29 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libctags-plugin.la
 dist_plugin_DATA = ctags.plugin
 
-libctags_plugin_la_SOURCES = \
-       ide-ctags-builder.c \
-       ide-ctags-builder.h \
-       ide-ctags-completion-item.c \
-       ide-ctags-completion-item.h \
-       ide-ctags-completion-provider.c \
-       ide-ctags-completion-provider.h \
+libctags_plugin_la_SOURCES =                    \
+       ide-ctags-builder.c                     \
+       ide-ctags-builder.h                     \
+       ide-ctags-completion-item.c             \
+       ide-ctags-completion-item.h             \
+       ide-ctags-completion-provider.c         \
+       ide-ctags-completion-provider.h         \
        ide-ctags-completion-provider-private.h \
-       ide-ctags-highlighter.c \
-       ide-ctags-highlighter.h \
-       ide-ctags-index.c \
-       ide-ctags-index.h \
-       ide-ctags-service.c \
-       ide-ctags-service.h \
-       ide-ctags-symbol-node.c \
-       ide-ctags-symbol-node.h \
-       ide-ctags-symbol-resolver.c \
-       ide-ctags-symbol-resolver.h \
-       ide-ctags-symbol-tree.c \
-       ide-ctags-symbol-tree.h \
-       ide-ctags-util.c \
-       ide-ctags-util.h \
-       ctags-plugin.c \
+       ide-ctags-highlighter.c                 \
+       ide-ctags-highlighter.h                 \
+       ide-ctags-index.c                       \
+       ide-ctags-index.h                       \
+       ide-ctags-service.c                     \
+       ide-ctags-service.h                     \
+       ide-ctags-symbol-node.c                 \
+       ide-ctags-symbol-node.h                 \
+       ide-ctags-symbol-resolver.c             \
+       ide-ctags-symbol-resolver.h             \
+       ide-ctags-symbol-tree.c                 \
+       ide-ctags-symbol-tree.h                 \
+       ide-ctags-util.c                        \
+       ide-ctags-util.h                        \
+       ctags-plugin.c                          \
        $(NULL)
 
 libctags_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index c35adb6..3433569 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -9,20 +9,20 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libdevhelp-plugin.la
 dist_plugin_DATA = devhelp.plugin
 
-libdevhelp_plugin_la_SOURCES = \
+libdevhelp_plugin_la_SOURCES =          \
        gbp-devhelp-editor-view-addin.c \
        gbp-devhelp-editor-view-addin.h \
-       gbp-devhelp-panel.c \
-       gbp-devhelp-panel.h \
-       gbp-devhelp-plugin.c \
-       gbp-devhelp-view.c \
-       gbp-devhelp-view.h \
-       gbp-devhelp-workbench-addin.c \
-       gbp-devhelp-workbench-addin.h \
+       gbp-devhelp-panel.c             \
+       gbp-devhelp-panel.h             \
+       gbp-devhelp-plugin.c            \
+       gbp-devhelp-view.c              \
+       gbp-devhelp-view.h              \
+       gbp-devhelp-workbench-addin.c   \
+       gbp-devhelp-workbench-addin.h   \
        $(NULL)
 
-nodist_libdevhelp_plugin_la_SOURCES = \
-       gbp-devhelp-resources.c \
+nodist_libdevhelp_plugin_la_SOURCES =   \
+       gbp-devhelp-resources.c         \
        gbp-devhelp-resources.h
 
 libdevhelp_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(DEVHELP_CFLAGS)
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index f9fa27b..1bcf712 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -4,13 +4,13 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libfile-search.la
 dist_plugin_DATA = file-search.plugin
 
-libfile_search_la_SOURCES = \
+libfile_search_la_SOURCES =       \
        gb-file-search-provider.c \
        gb-file-search-provider.h \
-       gb-file-search-result.c \
-       gb-file-search-result.h \
-       gb-file-search-index.c \
-       gb-file-search-index.h \
+       gb-file-search-result.c   \
+       gb-file-search-result.h   \
+       gb-file-search-index.c    \
+       gb-file-search-index.h    \
        $(NULL)
 
 libfile_search_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/flatpak/Makefile.am b/plugins/flatpak/Makefile.am
index a18592d..5a5440e 100644
--- a/plugins/flatpak/Makefile.am
+++ b/plugins/flatpak/Makefile.am
@@ -9,40 +9,40 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libflatpak-plugin.la
 dist_plugin_DATA = flatpak.plugin
 
-libflatpak_plugin_la_SOURCES = \
-       gbp-flatpak-application-addin.c \
-       gbp-flatpak-application-addin.h \
-       gbp-flatpak-clone-widget.c \
-       gbp-flatpak-clone-widget.h \
-       gbp-flatpak-configuration.c \
-       gbp-flatpak-configuration.h \
+libflatpak_plugin_la_SOURCES =               \
+       gbp-flatpak-application-addin.c      \
+       gbp-flatpak-application-addin.h      \
+       gbp-flatpak-clone-widget.c           \
+       gbp-flatpak-clone-widget.h           \
+       gbp-flatpak-configuration.c          \
+       gbp-flatpak-configuration.h          \
        gbp-flatpak-configuration-provider.c \
        gbp-flatpak-configuration-provider.h \
-       gbp-flatpak-genesis-addin.c \
-       gbp-flatpak-genesis-addin.h \
-       gbp-flatpak-pipeline-addin.c \
-       gbp-flatpak-pipeline-addin.h \
-       gbp-flatpak-preferences-addin.c \
-       gbp-flatpak-preferences-addin.h \
-       gbp-flatpak-plugin.c \
-       gbp-flatpak-runner.c \
-       gbp-flatpak-runner.h \
-       gbp-flatpak-runtime-provider.c \
-       gbp-flatpak-runtime-provider.h \
-       gbp-flatpak-runtime.c \
-       gbp-flatpak-runtime.h \
-       gbp-flatpak-sources.c \
-       gbp-flatpak-sources.h \
-       gbp-flatpak-subprocess-launcher.c \
-       gbp-flatpak-subprocess-launcher.h \
-       gbp-flatpak-transfer.c \
-       gbp-flatpak-transfer.h \
-       gbp-flatpak-util.c \
-       gbp-flatpak-util.h \
+       gbp-flatpak-genesis-addin.c          \
+       gbp-flatpak-genesis-addin.h          \
+       gbp-flatpak-pipeline-addin.c         \
+       gbp-flatpak-pipeline-addin.h         \
+       gbp-flatpak-preferences-addin.c      \
+       gbp-flatpak-preferences-addin.h      \
+       gbp-flatpak-plugin.c                 \
+       gbp-flatpak-runner.c                 \
+       gbp-flatpak-runner.h                 \
+       gbp-flatpak-runtime-provider.c       \
+       gbp-flatpak-runtime-provider.h       \
+       gbp-flatpak-runtime.c                \
+       gbp-flatpak-runtime.h                \
+       gbp-flatpak-sources.c                \
+       gbp-flatpak-sources.h                \
+       gbp-flatpak-subprocess-launcher.c    \
+       gbp-flatpak-subprocess-launcher.h    \
+       gbp-flatpak-transfer.c               \
+       gbp-flatpak-transfer.h               \
+       gbp-flatpak-util.c                   \
+       gbp-flatpak-util.h                   \
        $(NULL)
 
-nodist_libflatpak_plugin_la_SOURCES = \
-       gbp-flatpak-resources.c \
+nodist_libflatpak_plugin_la_SOURCES =        \
+       gbp-flatpak-resources.c              \
        gbp-flatpak-resources.h
 
 libflatpak_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(FLATPAK_CFLAGS) $(GIT_CFLAGS) $(SOUP_CFLAGS)
diff --git a/plugins/gcc/Makefile.am b/plugins/gcc/Makefile.am
index 1e269c4..e61eb2b 100644
--- a/plugins/gcc/Makefile.am
+++ b/plugins/gcc/Makefile.am
@@ -6,7 +6,7 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libgcc-plugin.la
 dist_plugin_DATA = gcc.plugin
 
-libgcc_plugin_la_SOURCES = \
+libgcc_plugin_la_SOURCES =       \
        gbp-gcc-pipeline-addin.c \
        gbp-gcc-pipeline-addin.h \
        gbp-gcc-plugin.c
diff --git a/plugins/gettext/Makefile.am b/plugins/gettext/Makefile.am
index 3b83e91..18085bf 100644
--- a/plugins/gettext/Makefile.am
+++ b/plugins/gettext/Makefile.am
@@ -6,10 +6,10 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libgettext-plugin.la
 dist_plugin_DATA = gettext.plugin
 
-libgettext_plugin_la_SOURCES = \
+libgettext_plugin_la_SOURCES =            \
        ide-gettext-diagnostic-provider.c \
        ide-gettext-diagnostic-provider.h \
-       gettext-plugin.c \
+       gettext-plugin.c                  \
        $(NULL)
 
 libgettext_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(GETTEXT_CFLAGS)
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 49ab936..987c44c 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -9,26 +9,26 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libgit-plugin.la
 dist_plugin_DATA = git.plugin
 
-libgit_plugin_la_SOURCES = \
+libgit_plugin_la_SOURCES =              \
        ide-git-buffer-change-monitor.c \
        ide-git-buffer-change-monitor.h \
-       ide-git-clone-widget.c \
-       ide-git-clone-widget.h \
-       ide-git-genesis-addin.c \
-       ide-git-genesis-addin.h \
-       ide-git-plugin.c \
-       ide-git-remote-callbacks.c \
-       ide-git-remote-callbacks.h \
-       ide-git-vcs.c \
-       ide-git-vcs.h \
-       ide-git-vcs-config.c \
-       ide-git-vcs-config.h \
-       ide-git-vcs-initializer.c \
-       ide-git-vcs-initializer.h \
+       ide-git-clone-widget.c          \
+       ide-git-clone-widget.h          \
+       ide-git-genesis-addin.c         \
+       ide-git-genesis-addin.h         \
+       ide-git-plugin.c                \
+       ide-git-remote-callbacks.c      \
+       ide-git-remote-callbacks.h      \
+       ide-git-vcs.c                   \
+       ide-git-vcs.h                   \
+       ide-git-vcs-config.c            \
+       ide-git-vcs-config.h            \
+       ide-git-vcs-initializer.c       \
+       ide-git-vcs-initializer.h       \
        $(NULL)
 
-nodist_libgit_plugin_la_SOURCES = \
-       ide-git-resources.c \
+nodist_libgit_plugin_la_SOURCES =       \
+       ide-git-resources.c             \
        ide-git-resources.h
 
 libgit_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(GIT_CFLAGS)
diff --git a/plugins/gnome-code-assistance/Makefile.am b/plugins/gnome-code-assistance/Makefile.am
index 3935d6d..cc01abc 100644
--- a/plugins/gnome-code-assistance/Makefile.am
+++ b/plugins/gnome-code-assistance/Makefile.am
@@ -5,19 +5,19 @@ plugin_LTLIBRARIES = libgnome-code-assistance-plugin.la
 dist_plugin_DATA = gnome-code-assistance.plugin
 
 libgnome_code_assistance_plugin_la_SOURCES = \
-       gca-diagnostics.c \
-       gca-diagnostics.h \
-       gca-service.c \
-       gca-service.h \
-       gca-structs.c \
-       gca-structs.h \
-       gca-plugin.c \
-       ide-gca-diagnostic-provider.c \
-       ide-gca-diagnostic-provider.h \
-       ide-gca-preferences-addin.c \
-       ide-gca-preferences-addin.h \
-       ide-gca-service.c \
-       ide-gca-service.h \
+       gca-diagnostics.c                    \
+       gca-diagnostics.h                    \
+       gca-service.c                        \
+       gca-service.h                        \
+       gca-structs.c                        \
+       gca-structs.h                        \
+       gca-plugin.c                         \
+       ide-gca-diagnostic-provider.c        \
+       ide-gca-diagnostic-provider.h        \
+       ide-gca-preferences-addin.c          \
+       ide-gca-preferences-addin.h          \
+       ide-gca-service.c                    \
+       ide-gca-service.h                    \
        $(NULL)
 
 libgnome_code_assistance_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/html-preview/Makefile.am b/plugins/html-preview/Makefile.am
index caf135e..bf6d27c 100644
--- a/plugins/html-preview/Makefile.am
+++ b/plugins/html-preview/Makefile.am
@@ -9,8 +9,8 @@ moduledir = $(libdir)/gnome-builder/plugins/html_preview_plugin
 dist_module_DATA = html_preview_plugin/__init__.py
 
 resourcedir = $(datadir)/gnome-builder/plugins/html_preview_plugin
-dist_resource_DATA = \
-       html_preview_plugin/markdown.css \
+dist_resource_DATA =                         \
+       html_preview_plugin/markdown.css     \
        html_preview_plugin/markdown-view.js \
        html_preview_plugin/marked.js
 
diff --git a/plugins/jedi/Makefile.am b/plugins/jedi/Makefile.am
index 948c06c..f4d3de6 100644
--- a/plugins/jedi/Makefile.am
+++ b/plugins/jedi/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_JEDI_PLUGIN
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
-dist_plugin_DATA = \
+dist_plugin_DATA =  \
        jedi.plugin \
        jedi_plugin.py
 
diff --git a/plugins/jhbuild/Makefile.am b/plugins/jhbuild/Makefile.am
index 34793d9..b934631 100644
--- a/plugins/jhbuild/Makefile.am
+++ b/plugins/jhbuild/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_JHBUILD_PLUGIN
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
-dist_plugin_DATA = \
+dist_plugin_DATA =     \
        jhbuild.plugin \
        jhbuild_plugin.py
 
diff --git a/plugins/meson-templates/Makefile.am b/plugins/meson-templates/Makefile.am
index d870430..28fcc79 100644
--- a/plugins/meson-templates/Makefile.am
+++ b/plugins/meson-templates/Makefile.am
@@ -7,12 +7,12 @@ moduledir = $(libdir)/gnome-builder/plugins/meson_templates
 dist_module_DATA = meson_templates/__init__.py
 
 resourcedir = $(datadir)/gnome-builder/plugins/
-nobase_resource_DATA = \
-       meson_templates/resources/meson.build \
+nobase_resource_DATA =                            \
+       meson_templates/resources/meson.build     \
        meson_templates/resources/src/meson.build \
-       meson_templates/resources/src/main.c \
-       meson_templates/resources/po/meson.build \
-       meson_templates/resources/po/LINGUAS \
+       meson_templates/resources/src/main.c      \
+       meson_templates/resources/po/meson.build  \
+       meson_templates/resources/po/LINGUAS      \
        meson_templates/resources/po/POTFILES
 
 EXTRA_DIST = $(nobase_resource_DATA)
diff --git a/plugins/mingw/Makefile.am b/plugins/mingw/Makefile.am
index cacdb83..85ea515 100644
--- a/plugins/mingw/Makefile.am
+++ b/plugins/mingw/Makefile.am
@@ -6,10 +6,10 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libmingw-plugin.la
 dist_plugin_DATA = mingw.plugin
 
-libmingw_plugin_la_SOURCES = \
-       mingw-plugin.c \
-       ide-mingw-device.c \
-       ide-mingw-device.h \
+libmingw_plugin_la_SOURCES =        \
+       mingw-plugin.c              \
+       ide-mingw-device.c          \
+       ide-mingw-device.h          \
        ide-mingw-device-provider.c \
        ide-mingw-device-provider.h \
        $(NULL)
diff --git a/plugins/project-tree/Makefile.am b/plugins/project-tree/Makefile.am
index 202576a..e517788 100644
--- a/plugins/project-tree/Makefile.am
+++ b/plugins/project-tree/Makefile.am
@@ -9,37 +9,37 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libproject-tree-plugin.la
 dist_plugin_DATA = project-tree.plugin
 
-libproject_tree_plugin_la_SOURCES = \
-       gb-new-file-popover.c \
-       gb-new-file-popover.h \
-       gb-project-file.c \
-       gb-project-file.h \
-       gb-project-tree-actions.c \
-       gb-project-tree-actions.h \
-       gb-project-tree-builder.c \
-       gb-project-tree-builder.h \
-       gb-project-tree.c \
-       gb-project-tree.h \
-       gb-project-tree-editor-addin.c \
-       gb-project-tree-editor-addin.h \
-       gb-project-tree-private.h \
-       gb-rename-file-popover.c \
-       gb-rename-file-popover.h \
-       gb-project-tree-addin.c \
-       gb-project-tree-addin.h \
-       project-tree-plugin.c \
+libproject_tree_plugin_la_SOURCES =        \
+       gb-new-file-popover.c              \
+       gb-new-file-popover.h              \
+       gb-project-file.c                  \
+       gb-project-file.h                  \
+       gb-project-tree-actions.c          \
+       gb-project-tree-actions.h          \
+       gb-project-tree-builder.c          \
+       gb-project-tree-builder.h          \
+       gb-project-tree.c                  \
+       gb-project-tree.h                  \
+       gb-project-tree-editor-addin.c     \
+       gb-project-tree-editor-addin.h     \
+       gb-project-tree-private.h          \
+       gb-rename-file-popover.c           \
+       gb-rename-file-popover.h           \
+       gb-project-tree-addin.c            \
+       gb-project-tree-addin.h            \
+       project-tree-plugin.c              \
        $(NULL)
 
 nodist_libproject_tree_plugin_la_SOURCES = \
-       gb-project-tree-resources.c \
+       gb-project-tree-resources.c        \
        gb-project-tree-resources.h
 
 libproject_tree_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
 libproject_tree_plugin_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 if ENABLE_TERMINAL_PLUGIN
 libproject_tree_plugin_la_LIBADD = $(TERMINAL_LIBS)
-libproject_tree_plugin_la_CFLAGS += \
-       $(TERMINAL_CFLAGS) \
+libproject_tree_plugin_la_CFLAGS +=        \
+       $(TERMINAL_CFLAGS)                 \
        -DHAVE_VTE
 endif
 
diff --git a/plugins/python-gi-imports-completion/Makefile.am 
b/plugins/python-gi-imports-completion/Makefile.am
index 127edf6..26389d5 100644
--- a/plugins/python-gi-imports-completion/Makefile.am
+++ b/plugins/python-gi-imports-completion/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_PYTHON_GI_IMPORTS_COMPLETION_PLUGIN
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
-dist_plugin_DATA = \
+dist_plugin_DATA =                          \
        python-gi-imports-completion.plugin \
        python_gi_imports_completion.py
 
diff --git a/plugins/python-pack/Makefile.am b/plugins/python-pack/Makefile.am
index 40f1793..dc1045a 100644
--- a/plugins/python-pack/Makefile.am
+++ b/plugins/python-pack/Makefile.am
@@ -6,12 +6,12 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libpython-pack-plugin.la
 dist_plugin_DATA = python-pack.plugin
 
-libpython_pack_plugin_la_SOURCES = \
-       ide-python-indenter.c \
-       ide-python-indenter.h \
+libpython_pack_plugin_la_SOURCES =   \
+       ide-python-indenter.c        \
+       ide-python-indenter.h        \
        ide-python-format-provider.c \
        ide-python-format-provider.h \
-       python-pack-plugin.c \
+       python-pack-plugin.c         \
        $(NULL)
 
 libpython_pack_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/quick-highlight/Makefile.am b/plugins/quick-highlight/Makefile.am
index e8c8ebd..00982de 100644
--- a/plugins/quick-highlight/Makefile.am
+++ b/plugins/quick-highlight/Makefile.am
@@ -6,10 +6,10 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libquick-highlight-plugin.la
 dist_plugin_DATA = quick-highlight.plugin
 
-libquick_highlight_plugin_la_SOURCES = \
-       gbp-quick-highlight-plugin.c \
-       gbp-quick-highlight-view-addin.c \
-       gbp-quick-highlight-view-addin.h \
+libquick_highlight_plugin_la_SOURCES =    \
+       gbp-quick-highlight-plugin.c      \
+       gbp-quick-highlight-view-addin.c  \
+       gbp-quick-highlight-view-addin.h  \
        gbp-quick-highlight-preferences.c \
        gbp-quick-highlight-preferences.h \
        $(NULL)
diff --git a/plugins/rust-langserv/Makefile.am b/plugins/rust-langserv/Makefile.am
index 5dd7d88..bf7e995 100644
--- a/plugins/rust-langserv/Makefile.am
+++ b/plugins/rust-langserv/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_RUST_LANGSERV_PLUGIN
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
-dist_plugin_DATA = \
+dist_plugin_DATA =           \
        rust-langserv.plugin \
        rust_langserv_plugin.py
 
diff --git a/plugins/rustup/Makefile.am b/plugins/rustup/Makefile.am
index 28bbd9b..f3b5886 100644
--- a/plugins/rustup/Makefile.am
+++ b/plugins/rustup/Makefile.am
@@ -9,7 +9,7 @@ moduledir = $(libdir)/gnome-builder/plugins/rustup_plugin
 dist_module_DATA = rustup_plugin/__init__.py
 
 resourcedir = $(datadir)/gnome-builder/plugins/
-nobase_resource_DATA = \
+nobase_resource_DATA =                    \
        rustup_plugin/resources/rustup.sh \
        $(NULL)
 
diff --git a/plugins/support/Makefile.am b/plugins/support/Makefile.am
index b44730b..adea453 100644
--- a/plugins/support/Makefile.am
+++ b/plugins/support/Makefile.am
@@ -9,16 +9,16 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libsupport-plugin.la
 dist_plugin_DATA = support.plugin
 
-libsupport_plugin_la_SOURCES = \
+libsupport_plugin_la_SOURCES =          \
        ide-support-application-addin.c \
        ide-support-application-addin.h \
-       ide-support.c \
-       ide-support.h \
-       ide-support-plugin.c \
+       ide-support.c                   \
+       ide-support.h                   \
+       ide-support-plugin.c            \
        $(NULL)
 
-nodist_libsupport_plugin_la_SOURCES = \
-       ide-support-resources.c \
+nodist_libsupport_plugin_la_SOURCES =   \
+       ide-support-resources.c         \
        ide-support-resources.h
 
 libsupport_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 992be03..a908ca9 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -9,17 +9,17 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libsymbol-tree.la
 dist_plugin_DATA = symbol-tree.plugin
 
-libsymbol_tree_la_SOURCES = \
-       symbol-tree-builder.c \
-       symbol-tree-builder.h \
-       symbol-tree-panel.c \
-       symbol-tree-panel.h \
-       symbol-tree.c \
-       symbol-tree.h \
+libsymbol_tree_la_SOURCES =        \
+       symbol-tree-builder.c      \
+       symbol-tree-builder.h      \
+       symbol-tree-panel.c        \
+       symbol-tree-panel.h        \
+       symbol-tree.c              \
+       symbol-tree.h              \
        $(NULL)
 
 nodist_libsymbol_tree_la_SOURCES = \
-       symbol-tree-resources.c \
+       symbol-tree-resources.c    \
        symbol-tree-resources.h
 
 libsymbol_tree_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index 8dcbe5c..21d0d3e 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -9,11 +9,11 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libsysmon.la
 dist_plugin_DATA = sysmon.plugin
 
-libsysmon_la_SOURCES = \
-       gb-sysmon-panel.c \
-       gb-sysmon-panel.h \
-       gb-sysmon-addin.c \
-       gb-sysmon-addin.h \
+libsysmon_la_SOURCES =        \
+       gb-sysmon-panel.c     \
+       gb-sysmon-panel.h     \
+       gb-sysmon-addin.c     \
+       gb-sysmon-addin.h     \
        $(NULL)
 
 nodist_libsysmon_la_SOURCES = \
diff --git a/plugins/sysprof/Makefile.am b/plugins/sysprof/Makefile.am
index e7cd191..5217814 100644
--- a/plugins/sysprof/Makefile.am
+++ b/plugins/sysprof/Makefile.am
@@ -9,16 +9,16 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libsysprof-plugin.la
 dist_plugin_DATA = sysprof.plugin
 
-libsysprof_plugin_la_SOURCES = \
-       gbp-sysprof-plugin.c \
-       gbp-sysprof-perspective.c \
-       gbp-sysprof-perspective.h \
+libsysprof_plugin_la_SOURCES =        \
+       gbp-sysprof-plugin.c          \
+       gbp-sysprof-perspective.c     \
+       gbp-sysprof-perspective.h     \
        gbp-sysprof-workbench-addin.c \
        gbp-sysprof-workbench-addin.h \
        $(NULL)
 
 nodist_libsysprof_plugin_la_SOURCES = \
-       gbp-sysprof-resources.c \
+       gbp-sysprof-resources.c       \
        gbp-sysprof-resources.h
 
 libsysprof_plugin_la_CFLAGS = $(PLUGIN_CFLAGS) $(SYSPROF_CFLAGS)
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 5483a50..a53ee14 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -9,35 +9,35 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libterminal.la
 dist_plugin_DATA = terminal.plugin
 
-libterminal_la_SOURCES = \
-       gb-terminal.c \
-       gb-terminal.h \
-       gb-terminal-application-addin.c \
-       gb-terminal-application-addin.h \
-       gb-terminal-plugin.c \
-       gb-terminal-private.h \
-       gb-terminal-util.c \
-       gb-terminal-util.h \
-       gb-terminal-view.c \
-       gb-terminal-view.h \
-       gb-terminal-view-private.h \
-       gb-terminal-view-actions.c \
-       gb-terminal-view-actions.h \
-       gb-terminal-search.c \
-       gb-terminal-search.h \
-       gb-terminal-search-private.h \
-       gb-terminal-workbench-addin.c \
-       gb-terminal-workbench-addin.h \
+libterminal_la_SOURCES =                    \
+       gb-terminal.c                       \
+       gb-terminal.h                       \
+       gb-terminal-application-addin.c     \
+       gb-terminal-application-addin.h     \
+       gb-terminal-plugin.c                \
+       gb-terminal-private.h               \
+       gb-terminal-util.c                  \
+       gb-terminal-util.h                  \
+       gb-terminal-view.c                  \
+       gb-terminal-view.h                  \
+       gb-terminal-view-private.h          \
+       gb-terminal-view-actions.c          \
+       gb-terminal-view-actions.h          \
+       gb-terminal-search.c                \
+       gb-terminal-search.h                \
+       gb-terminal-search-private.h        \
+       gb-terminal-workbench-addin.c       \
+       gb-terminal-workbench-addin.h       \
        $(NULL)
 
-nodist_libterminal_la_SOURCES = \
-       gb-terminal-resources.c \
-       gb-terminal-resources.h \
+nodist_libterminal_la_SOURCES =             \
+       gb-terminal-resources.c             \
+       gb-terminal-resources.h             \
        $(NULL)
 
 libterminal_la_CFLAGS = $(PLUGIN_CFLAGS) $(TERMINAL_CFLAGS)
-libterminal_la_LIBADD = \
-    $(TERMINAL_LIBS) \
+libterminal_la_LIBADD =                     \
+    $(TERMINAL_LIBS)                            \
     $(top_builddir)/contrib/gd/libgd-private.la \
     $(NULL)
 libterminal_la_LDFLAGS = $(PLUGIN_LDFLAGS)
diff --git a/plugins/vala-pack/Makefile.am b/plugins/vala-pack/Makefile.am
index 8f1e85a..e003738 100644
--- a/plugins/vala-pack/Makefile.am
+++ b/plugins/vala-pack/Makefile.am
@@ -18,58 +18,58 @@ dist_plugin_DATA = vala-pack.plugin
 BUILT_SOURCES = libvala_pack_plugin_la_vala.stamp
 
 libvala_pack_plugin_la_vala.stamp: $(libvala_pack_plugin_la_VALASOURCES)
-       $(AM_V_GEN)$(VALAC) \
-               $(libvala_pack_plugin_la_VALAFLAGS) \
+       $(AM_V_GEN)$(VALAC)                                                   \
+               $(libvala_pack_plugin_la_VALAFLAGS)                           \
                $(addprefix $(srcdir)/,$(libvala_pack_plugin_la_VALASOURCES)) \
-               --ccode \
+               --ccode                                                       \
                && touch $@
 
-libvala_pack_plugin_la_VALASOURCES = \
-       config.vapi \
-       ide-vala-service.vala \
-       ide-vala-completion.vala \
-       ide-vala-completion-item.vala \
-       ide-vala-completion-provider.vala \
-       ide-vala-diagnostics.vala \
-       ide-vala-diagnostic-provider.vala \
-       ide-vala-indenter.vala \
-       ide-vala-index.vala \
-       ide-vala-locator.vala \
-       ide-vala-preferences-addin.vala \
-       ide-vala-source-file.vala \
-       ide-vala-symbol-resolver.vala \
-       ide-vala-symbol-tree.vala \
-       vala-pack-plugin.vala \
+libvala_pack_plugin_la_VALASOURCES =                                          \
+       config.vapi                                                           \
+       ide-vala-service.vala                                                 \
+       ide-vala-completion.vala                                              \
+       ide-vala-completion-item.vala                                         \
+       ide-vala-completion-provider.vala                                     \
+       ide-vala-diagnostics.vala                                             \
+       ide-vala-diagnostic-provider.vala                                     \
+       ide-vala-indenter.vala                                                \
+       ide-vala-index.vala                                                   \
+       ide-vala-locator.vala                                                 \
+       ide-vala-preferences-addin.vala                                       \
+       ide-vala-source-file.vala                                             \
+       ide-vala-symbol-resolver.vala                                         \
+       ide-vala-symbol-tree.vala                                             \
+       vala-pack-plugin.vala                                                 \
        $(NULL)
 
 EXTRA_DIST += $(libvala_pack_plugin_la_VALASOURCES)
 
-nodist_libvala_pack_plugin_la_SOURCES = \
-       ide-vala-service.c \
-       ide-vala-completion.c \
-       ide-vala-completion-item.c \
-       ide-vala-completion-provider.c \
-       ide-vala-diagnostics.c \
-       ide-vala-diagnostic-provider.c \
-       ide-vala-indenter.c \
-       ide-vala-index.c \
-       ide-vala-locator.c \
-       ide-vala-preferences-addin.c \
-       ide-vala-source-file.c \
-       ide-vala-symbol-resolver.c \
-       ide-vala-symbol-tree.c \
-       vala-pack-plugin.c \
+nodist_libvala_pack_plugin_la_SOURCES =                                       \
+       ide-vala-service.c                                                    \
+       ide-vala-completion.c                                                 \
+       ide-vala-completion-item.c                                            \
+       ide-vala-completion-provider.c                                        \
+       ide-vala-diagnostics.c                                                \
+       ide-vala-diagnostic-provider.c                                        \
+       ide-vala-indenter.c                                                   \
+       ide-vala-index.c                                                      \
+       ide-vala-locator.c                                                    \
+       ide-vala-preferences-addin.c                                          \
+       ide-vala-source-file.c                                                \
+       ide-vala-symbol-resolver.c                                            \
+       ide-vala-symbol-tree.c                                                \
+       vala-pack-plugin.c                                                    \
        $(NULL)
 
 CLEANFILES = $(BUILT_SOURCES) $(nodist_libvala_pack_plugin_la_SOURCES)
 
-libvala_pack_plugin_la_VALAFLAGS = \
-       $(PLUGIN_VALAFLAGS) \
-       --pkg gtksourceview-3.0 \
-       --pkg libvala-$(VALA_VERSION) \
-       --pkg posix \
-       --pkg gio-2.0 \
-       --pkg template-glib-1.0 \
+libvala_pack_plugin_la_VALAFLAGS =                                            \
+       $(PLUGIN_VALAFLAGS)                                                   \
+       --pkg gtksourceview-3.0                                               \
+       --pkg libvala-$(VALA_VERSION)                                         \
+       --pkg posix                                                           \
+       --pkg gio-2.0                                                         \
+       --pkg template-glib-1.0                                               \
        $(NULL)
 
 if ENABLE_VALA_SYMBOL_GET_DEPRECATED
@@ -80,21 +80,21 @@ if ENABLE_VALA_CODE_CONTEXT_SET_THREAD
 libvala_pack_plugin_la_VALAFLAGS += -D ENABLE_VALA_CODE_CONTEXT_SET_THREAD
 endif
 
-libvala_pack_plugin_la_CFLAGS = \
-       -DVALA_VERSION=\""$(VALA_VERSION)"\" \
-       -DPACKAGE_DATADIR=\""$(datadir)/gnome-builder"\" \
-       -DG_LOG_DOMAIN=\"vala-pack-plugin\" \
-       -DGETTEXT_PACKAGE=\"gnome-builder\" \
-       $(PLUGIN_CFLAGS) \
-       $(VALA_CFLAGS) \
-       -Wno-deprecated-declarations \
-       -Wno-discarded-qualifiers \
-       -Wno-implicit-function-declaration \
-       -Wno-incompatible-pointer-types \
-       -Wno-unused-but-set-variable \
-       -Wno-unused-label \
-       -Wno-unused-function \
-       -Wno-unused-variable \
+libvala_pack_plugin_la_CFLAGS =                                               \
+       -DVALA_VERSION=\""$(VALA_VERSION)"\"                                  \
+       -DPACKAGE_DATADIR=\""$(datadir)/gnome-builder"\"                      \
+       -DG_LOG_DOMAIN=\"vala-pack-plugin\"                                   \
+       -DGETTEXT_PACKAGE=\"gnome-builder\"                                   \
+       $(PLUGIN_CFLAGS)                                                      \
+       $(VALA_CFLAGS)                                                        \
+       -Wno-deprecated-declarations                                          \
+       -Wno-discarded-qualifiers                                             \
+       -Wno-implicit-function-declaration                                    \
+       -Wno-incompatible-pointer-types                                       \
+       -Wno-unused-but-set-variable                                          \
+       -Wno-unused-label                                                     \
+       -Wno-unused-function                                                  \
+       -Wno-unused-variable                                                  \
        $(NULL)
 
 libvala_pack_plugin_la_LIBADD = $(VALA_LIBS)
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index bfda967..0254c88 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -6,38 +6,38 @@ plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libxml-pack-plugin.la
 dist_plugin_DATA = xml-pack.plugin
 
-libxml_pack_plugin_la_SOURCES = \
-       ide-xml-analysis.c \
-       ide-xml-analysis.h \
-       ide-xml-diagnostic-provider.c \
-       ide-xml-diagnostic-provider.h \
-       ide-xml-highlighter.c \
-       ide-xml-highlighter.h \
-       ide-xml-indenter.c \
-       ide-xml-indenter.h \
-       ide-xml-sax.c \
-       ide-xml-sax.h \
-       ide-xml-service.c \
-       ide-xml-service.h \
-       ide-xml-stack.c \
-       ide-xml-stack.h \
-       ide-xml-symbol-node.c \
-       ide-xml-symbol-node.h \
-       ide-xml-symbol-resolver.c \
-       ide-xml-symbol-resolver.h \
-       ide-xml-symbol-tree.c \
-       ide-xml-symbol-tree.h \
-       ide-xml-tree-builder.c \
-       ide-xml-tree-builder.h \
-       ide-xml-tree-builder-generic.c \
-       ide-xml-tree-builder-generic.h \
-       ide-xml-tree-builder-ui.c \
-       ide-xml-tree-builder-ui.h \
-       ide-xml-tree-builder-utils.c \
+libxml_pack_plugin_la_SOURCES =              \
+       ide-xml-analysis.c                   \
+       ide-xml-analysis.h                   \
+       ide-xml-diagnostic-provider.c        \
+       ide-xml-diagnostic-provider.h        \
+       ide-xml-highlighter.c                \
+       ide-xml-highlighter.h                \
+       ide-xml-indenter.c                   \
+       ide-xml-indenter.h                   \
+       ide-xml-sax.c                        \
+       ide-xml-sax.h                        \
+       ide-xml-service.c                    \
+       ide-xml-service.h                    \
+       ide-xml-stack.c                      \
+       ide-xml-stack.h                      \
+       ide-xml-symbol-node.c                \
+       ide-xml-symbol-node.h                \
+       ide-xml-symbol-resolver.c            \
+       ide-xml-symbol-resolver.h            \
+       ide-xml-symbol-tree.c                \
+       ide-xml-symbol-tree.h                \
+       ide-xml-tree-builder.c               \
+       ide-xml-tree-builder.h               \
+       ide-xml-tree-builder-generic.c       \
+       ide-xml-tree-builder-generic.h       \
+       ide-xml-tree-builder-ui.c            \
+       ide-xml-tree-builder-ui.h            \
+       ide-xml-tree-builder-utils.c         \
        ide-xml-tree-builder-utils-private.h \
-       ide-xml.c \
-       ide-xml.h \
-       xml-pack-plugin.c \
+       ide-xml.c                            \
+       ide-xml.h                            \
+       xml-pack-plugin.c                    \
        $(NULL)
 
 libxml_pack_plugin_la_CFLAGS = $(PLUGIN_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fdc5bc..6a496d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,31 @@
-bin_PROGRAMS = \
-       gnome-builder \
-       gnome-builder-cli \
+bin_PROGRAMS =                                         \
+       gnome-builder                                  \
+       gnome-builder-cli                              \
        $(NULL)
 
-libexec_PROGRAMS = \
-       gnome-builder-worker \
+libexec_PROGRAMS =                                     \
+       gnome-builder-worker                           \
        $(NULL)
 
-AM_CPPFLAGS = \
-       -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
-       $(LIBIDE_CFLAGS) \
-       $(DEBUG_CFLAGS) \
-       $(OPTIMIZE_CFLAGS) \
-       $(TERMINAL_CFLAGS) \
-       -I$(top_builddir)/data/icons/hicolor \
-       -I$(top_builddir)/libide \
-       -I$(top_srcdir)/libide \
-       -I$(top_srcdir)/contrib/pnl \
-       -I$(top_builddir)/contrib/pnl \
+AM_CPPFLAGS =                                          \
+       -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\"   \
+       $(LIBIDE_CFLAGS)                               \
+       $(DEBUG_CFLAGS)                                \
+       $(OPTIMIZE_CFLAGS)                             \
+       $(TERMINAL_CFLAGS)                             \
+       -I$(top_builddir)/data/icons/hicolor           \
+       -I$(top_builddir)/libide                       \
+       -I$(top_srcdir)/libide                         \
+       -I$(top_srcdir)/contrib/pnl                    \
+       -I$(top_builddir)/contrib/pnl                  \
        $(NULL)
 
-gnome_builder_libs = \
-       $(LIBIDE_LIBS) \
-       $(top_builddir)/contrib/egg/libegg-private.la \
-       $(top_builddir)/contrib/pnl/libpanel-gtk.la \
+gnome_builder_libs =                                   \
+       $(LIBIDE_LIBS)                                 \
+       $(top_builddir)/contrib/egg/libegg-private.la  \
+       $(top_builddir)/contrib/pnl/libpanel-gtk.la    \
        $(top_builddir)/data/icons/hicolor/libicons.la \
-       $(top_builddir)/libide/libide-1.0.la \
+       $(top_builddir)/libide/libide-1.0.la           \
        $(NULL)
 
 AM_LDFLAGS = -export-dynamic
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6273991..59f2f17 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,87 +3,87 @@
 
 EXTRA_DIST =
 
-egg_cflags = \
-       $(DEBUG_CFLAGS) \
-       $(LIBIDE_CFLAGS) \
-       -I$(top_srcdir)/contrib/egg \
-       -DTEST_DATA_DIR="\"$(abs_srcdir)/data\"" \
+egg_cflags =                                                                                                 
                                            \
+       $(DEBUG_CFLAGS)                                                                                       
                                           \
+       $(LIBIDE_CFLAGS)                                                                                      
                                           \
+       -I$(top_srcdir)/contrib/egg                                                                           
                                           \
+       -DTEST_DATA_DIR="\"$(abs_srcdir)/data\""                                                              
                                           \
        $(NULL)
 
-egg_libs = \
-       $(LIBIDE_LIBS) \
-       $(top_builddir)/contrib/egg/libegg-private.la \
+egg_libs =                                                                                                   
                                            \
+       $(LIBIDE_LIBS)                                                                                        
                                           \
+       $(top_builddir)/contrib/egg/libegg-private.la                                                         
                                           \
        $(NULL)
 
-rg_cflags = \
-       $(DEBUG_CFLAGS) \
-       $(RG_CFLAGS) \
-       -I$(top_srcdir)/contrib/egg \
-       -I$(top_srcdir)/contrib/rg \
+rg_cflags =                                                                                                  
                                            \
+       $(DEBUG_CFLAGS)                                                                                       
                                           \
+       $(RG_CFLAGS)                                                                                          
                                           \
+       -I$(top_srcdir)/contrib/egg                                                                           
                                           \
+       -I$(top_srcdir)/contrib/rg                                                                            
                                           \
        $(NULL)
 
-rg_libs = \
-       $(top_builddir)/contrib/egg/libegg-private.la \
-       $(top_builddir)/contrib/rg/librg.la \
-       $(RG_LIBS) \
+rg_libs =                                                                                                    
                                            \
+       $(top_builddir)/contrib/egg/libegg-private.la                                                         
                                           \
+       $(top_builddir)/contrib/rg/librg.la                                                                   
                                           \
+       $(RG_LIBS)                                                                                            
                                           \
        $(NULL)
 
-jsonrpc_cflags = \
-       $(DEBUG_CFLAGS) \
-       $(JSONRPC_CFLAGS) \
-       -I$(top_srcdir)/contrib/jsonrpc-glib \
+jsonrpc_cflags =                                                                                             
                                            \
+       $(DEBUG_CFLAGS)                                                                                       
                                           \
+       $(JSONRPC_CFLAGS)                                                                                     
                                           \
+       -I$(top_srcdir)/contrib/jsonrpc-glib                                                                  
                                           \
        $(NULL)
 
-jsonrpc_libs = \
-       $(top_builddir)/contrib/jsonrpc-glib/libjsonrpc-glib.la \
-       $(JSONRPC_LIBS) \
+jsonrpc_libs =                                                                                               
                                            \
+       $(top_builddir)/contrib/jsonrpc-glib/libjsonrpc-glib.la                                               
                                           \
+       $(JSONRPC_LIBS)                                                                                       
                                           \
        $(NULL)
 
-search_cflags = \
-       $(DEBUG_CFLAGS) \
-       $(SEARCH_CFLAGS) \
-       -I$(top_srcdir)/contrib/search \
-       -I$(top_srcdir)/libide/util \
+search_cflags =                                                                                              
                                            \
+       $(DEBUG_CFLAGS)                                                                                       
                                           \
+       $(SEARCH_CFLAGS)                                                                                      
                                           \
+       -I$(top_srcdir)/contrib/search                                                                        
                                           \
+       -I$(top_srcdir)/libide/util                                                                           
                                           \
        $(NULL)
 
-search_libs = \
-       $(SEARCH_LIBS) \
-       $(top_builddir)/contrib/search/libsearch.la \
-       $(top_builddir)/libide/libide-1.0.la \
-       $(top_builddir)/contrib/egg/libegg-private.la \
+search_libs =                                                                                                
                                            \
+       $(SEARCH_LIBS)                                                                                        
                                           \
+       $(top_builddir)/contrib/search/libsearch.la                                                           
                                           \
+       $(top_builddir)/libide/libide-1.0.la                                                                  
                                           \
+       $(top_builddir)/contrib/egg/libegg-private.la                                                         
                                           \
        $(NULL)
 
-tests_cflags = \
-       $(egg_cflags) \
-       $(LIBIDE_CFLAGS) \
-       -I$(top_srcdir)/libide \
-       -I$(top_builddir)/libide \
-       -I$(top_srcdir)/contrib/pnl \
-       -I$(top_builddir)/contrib/pnl \
+tests_cflags =                                                                                               
                                            \
+       $(egg_cflags)                                                                                         
                                           \
+       $(LIBIDE_CFLAGS)                                                                                      
                                           \
+       -I$(top_srcdir)/libide                                                                                
                                           \
+       -I$(top_builddir)/libide                                                                              
                                           \
+       -I$(top_srcdir)/contrib/pnl                                                                           
                                           \
+       -I$(top_builddir)/contrib/pnl                                                                         
                                           \
        $(NULL)
 
-tests_libs = \
-       $(LIBIDE_LIBS) \
-       $(top_builddir)/libide/libide-1.0.la \
-       $(top_builddir)/contrib/egg/libegg-private.la \
+tests_libs =                                                                                                 
                                            \
+       $(LIBIDE_LIBS)                                                                                        
                                           \
+       $(top_builddir)/libide/libide-1.0.la                                                                  
                                           \
+       $(top_builddir)/contrib/egg/libegg-private.la                                                         
                                           \
        $(NULL)
 
-tests_ldflags = \
-       -export-dynamic \
+tests_ldflags =                                                                                              
                                            \
+       -export-dynamic                                                                                       
                                           \
        $(NULL)
 
 misc_programs =
 
-TESTS_ENVIRONMENT= \
+TESTS_ENVIRONMENT=                                                                                           
                                            \
        
GI_TYPELIB_PATH="$(top_builddir)/libide:$(top_builddir)/contrib/tmpl:$(top_builddir)/contrib/egg:$(top_builddir)/contrib/pnl:$(GI_TYPELIB_PATH)"
 \
-       GB_IN_TREE_PLUGINS=1 \
-       G_TEST_SRCDIR="$(abs_srcdir)" \
-       G_TEST_BUILDDIR="$(abs_builddir)" \
-       G_DEBUG=gc-friendly \
-       GSETTINGS_BACKEND=memory \
-       GTK_IM_METHOD=none \
-       PYTHONDONTWRITEBYTECODE=yes \
-       MALLOC_CHECK_=2 \
+       GB_IN_TREE_PLUGINS=1                                                                                  
                                           \
+       G_TEST_SRCDIR="$(abs_srcdir)"                                                                         
                                           \
+       G_TEST_BUILDDIR="$(abs_builddir)"                                                                     
                                           \
+       G_DEBUG=gc-friendly                                                                                   
                                           \
+       GSETTINGS_BACKEND=memory                                                                              
                                           \
+       GTK_IM_METHOD=none                                                                                    
                                           \
+       PYTHONDONTWRITEBYTECODE=yes                                                                           
                                           \
+       MALLOC_CHECK_=2                                                                                       
                                           \
        MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
@@ -164,10 +164,10 @@ test_ide_uri_LDADD = $(tests_libs)
 
 #TESTS += test-c-parse-helper
 #test_c_parse_helper_SOURCES = test-c-parse-helper.c
-#test_c_parse_helper_CFLAGS = \
-#      $(tests_cflags) \
-#      -include $(top_srcdir)/libide/c/c-parse-helper.c \
-#      -include $(top_srcdir)/libide/c/c-parse-helper.h \
+#test_c_parse_helper_CFLAGS =                                                                                
                                            \
+#      $(tests_cflags)                                                                                       
                                                 \
+#      -include $(top_srcdir)/libide/c/c-parse-helper.c                                                      
                                                 \
+#      -include $(top_srcdir)/libide/c/c-parse-helper.h                                                      
                                                 \
 #      $(NULL)
 #test_c_parse_helper_LDADD = $(tests_libs)
 
@@ -223,12 +223,12 @@ misc_programs += test-egg-menu-manager
 test_egg_menu_manager_SOURCES = test-egg-menu-manager.c
 test_egg_menu_manager_CFLAGS = $(egg_cflags)
 test_egg_menu_manager_LDADD = $(egg_libs)
-EXTRA_DIST += \
-       menus-exten-1.ui \
-       menus-exten-2.ui \
-       menus-exten-3.ui \
-       menus-exten-4.ui \
-       menus-exten-5.ui \
+EXTRA_DIST +=                                                                                                
                                            \
+       menus-exten-1.ui                                                                                      
                                           \
+       menus-exten-2.ui                                                                                      
                                           \
+       menus-exten-3.ui                                                                                      
                                           \
+       menus-exten-4.ui                                                                                      
                                           \
+       menus-exten-5.ui                                                                                      
                                           \
        menus.ui
 
 
@@ -280,16 +280,16 @@ endif
 
 check_PROGRAMS = $(TESTS) $(misc_programs)
 
-EXTRA_DIST += \
-       data/project1/.editorconfig \
-       data/project1/.you-dont-git-me \
-       data/project1/autogen.sh \
-       data/project1/build-aux/m4/.keep \
-       data/project1/configure.ac \
-       data/project1/project1.c \
-       data/project1/project1.doap \
-       data/project1/tags \
-       data/project2/.you-dont-git-me \
+EXTRA_DIST +=                                                                                                
                                            \
+       data/project1/.editorconfig                                                                           
                                           \
+       data/project1/.you-dont-git-me                                                                        
                                           \
+       data/project1/autogen.sh                                                                              
                                           \
+       data/project1/build-aux/m4/.keep                                                                      
                                           \
+       data/project1/configure.ac                                                                            
                                           \
+       data/project1/project1.c                                                                              
                                           \
+       data/project1/project1.doap                                                                           
                                           \
+       data/project1/tags                                                                                    
                                           \
+       data/project2/.you-dont-git-me                                                                        
                                           \
        $(NULL)
 
 run-%: %


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]