commit 37fc52a399c80c1379dbc3bec08f34e8fd8b2aac
Author: Christian Hergert <chergert redhat com>
Date: Fri Feb 24 13:38:38 2017 -0800
build: tweak makefile beautifier script
This allows spaces after tabs at the beginning of the line.
Makefile.am | 152 ++++++++++----------
build/autotools/align_makefile.py | 2 +-
.../autotools_templates/resources/Makefile.am | 8 +-
plugins/terminal/Makefile.am | 46 +++---
tests/Makefile.am | 6 +-
5 files changed, 107 insertions(+), 107 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 54befd6..b70db17 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)" && \
+ @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 ); \
+ && 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)" && \
+ @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/autotools/align_makefile.py b/build/autotools/align_makefile.py
index 2fcabe9..070e5bb 100755
--- a/build/autotools/align_makefile.py
+++ b/build/autotools/align_makefile.py
@@ -21,7 +21,7 @@ def count_prefix_tabs(line):
def count_visual_chars(line):
n_tabs = count_prefix_tabs(line)
- return n_tabs * 8 + len(line.strip())
+ return n_tabs * 8 + len(line.replace('\t',''))
for path in filenames:
lines = None
diff --git a/plugins/autotools-templates/autotools_templates/resources/Makefile.am
b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
index 74829c4..16daa8f 100644
--- a/plugins/autotools-templates/autotools_templates/resources/Makefile.am
+++ b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
@@ -7,12 +7,12 @@ AUTHORS:
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
\
+ 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 );
\
+ echo Failed to generate $@ >&2 );
\
else touch $@; fi
# Generate the ChangeLog.
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index a53ee14..e321989 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -9,34 +9,34 @@ 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 = \
+libterminal_la_LIBADD = \
$(TERMINAL_LIBS) \
$(top_builddir)/contrib/gd/libgd-private.la \
$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 59f2f17..8c9d93d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -165,9 +165,9 @@ 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
\
+# $(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)