From 75662a4b055fccff02843ad4af4d8ab2810e9d46 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 22 Aug 2015 15:31:47 -0700 Subject: [PATCH] Standardize indentation in Makefile.am This was being done 5 different way in 5 places: - indent 3 spaces, then tabs to column 73 - indent 2 spaces, then tabs to column 73 - indent 2 spaces, then a single tab - indent with spaces up to equal sign, then tabs to column 73 - indent 1 tab, then tabs to column 73 I standardized on 8 spaces, then spaces to column 73. The 8 spaces lines up with common browsers' indentation of the rest of the makefile, which is indented by single tabs. The spaces to column 73 make sure the trailing backslashes line up regardless of the tabstop setting. --- Makefile.am | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6acb7200..01e42b82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,18 @@ ### C source files to be built and distributed. -LIBJQ_INCS = jq_parser.h builtin.h bytecode.h compile.h exec_stack.h \ - libm.h jv_alloc.h jv_dtoa.h jv_unicode.h locfile.h \ - opcode_list.h parser.y jv_utf8_tables.h lexer.l util.h linker.h +LIBJQ_INCS = jq_parser.h builtin.h bytecode.h compile.h exec_stack.h \ + libm.h jv_alloc.h jv_dtoa.h jv_unicode.h locfile.h \ + opcode_list.h parser.y jv_utf8_tables.h lexer.l util.h linker.h -LIBJQ_SRC = locfile.c bytecode.c compile.c execute.c builtin.c jv.c \ - jv_parse.c jv_print.c jv_dtoa.c jv_unicode.c jv_aux.c jv_file.c \ - jv_alloc.c jq_test.c util.c linker.c ${LIBJQ_INCS} +LIBJQ_SRC = locfile.c bytecode.c compile.c execute.c builtin.c jv.c \ + jv_parse.c jv_print.c jv_dtoa.c jv_unicode.c jv_aux.c jv_file.c \ + jv_alloc.c jq_test.c util.c linker.c ${LIBJQ_INCS} ### C build options -AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers \ - -Wno-unused-parameter -Wno-unused-function +AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers \ + -Wno-unused-parameter -Wno-unused-function ACLOCAL_AMFLAGS = -I config/m4 @@ -141,27 +141,27 @@ install-binaries: $(BUILT_SOURCES) # Ensure "make dist" fails when we can't build the real manpage dist-hook: real_docs -DOC_FILES = docs/content docs/public docs/templates docs/site.yml \ - docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \ - docs/default_manpage.md jq.1.default +DOC_FILES = docs/content docs/public docs/templates docs/site.yml \ + docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \ + docs/default_manpage.md jq.1.default # setup is only used by distribution developers, not package developers. # Still, as a matter of allowing patching, its not a bad idea to distribute # the developer setup script in the tarball. -EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec \ - $(DOC_FILES) scripts/version parser.h parser.c lexer.h \ - lexer.c tests/onig.supp tests/torture/input0.json \ - tests/modules/.jq tests/modules/a.jq tests/modules/b/b.jq \ - tests/modules/c/c.jq tests/modules/c/d.jq \ - tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq \ - tests/setup tests/jq.test tests/onig.test \ - tests/modules/data.json \ - tests/modules/syntaxerror/syntaxerror.jq \ - tests/modules/test_bind_order.jq \ - tests/modules/test_bind_order0.jq \ - tests/modules/test_bind_order1.jq \ - tests/modules/test_bind_order2.jq \ - jq.1.prebuilt +EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec \ + $(DOC_FILES) scripts/version parser.h parser.c lexer.h \ + lexer.c tests/onig.supp tests/torture/input0.json \ + tests/modules/.jq tests/modules/a.jq tests/modules/b/b.jq \ + tests/modules/c/c.jq tests/modules/c/d.jq \ + tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq \ + tests/setup tests/jq.test tests/onig.test \ + tests/modules/data.json \ + tests/modules/syntaxerror/syntaxerror.jq \ + tests/modules/test_bind_order.jq \ + tests/modules/test_bind_order0.jq \ + tests/modules/test_bind_order1.jq \ + tests/modules/test_bind_order2.jq \ + jq.1.prebuilt # README.md is expected in Github projects, good stuff in it, so we'll