mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Standardize indentation in Makefile.am

Browse Source 
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.
This commit is contained in:
David Tolnay
2015-08-22 15:31:47 -07:00
parent 4a993dff29
commit 75662a4b05
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Makefile.am
View File

@ -1,18 +1,18 @@
### C source files to be built and distributed. ### C source files to be built and distributed.
LIBJQ_INCS = jq_parser.h builtin.h bytecode.h compile.h exec_stack.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 \ 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 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 \ 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_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} jv_alloc.c jq_test.c util.c linker.c ${LIBJQ_INCS}
### C build options ### C build options
AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers \ AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers \
-Wno-unused-parameter -Wno-unused-function -Wno-unused-parameter -Wno-unused-function
ACLOCAL_AMFLAGS = -I config/m4 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 # Ensure "make dist" fails when we can't build the real manpage
dist-hook: real_docs dist-hook: real_docs
DOC_FILES = docs/content docs/public docs/templates docs/site.yml \ DOC_FILES = docs/content docs/public docs/templates docs/site.yml \
docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \ docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \
docs/default_manpage.md jq.1.default docs/default_manpage.md jq.1.default
# setup is only used by distribution developers, not package developers. # setup is only used by distribution developers, not package developers.
# Still, as a matter of allowing patching, its not a bad idea to distribute # Still, as a matter of allowing patching, its not a bad idea to distribute
# the developer setup script in the tarball. # the developer setup script in the tarball.
EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec \ EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec \
$(DOC_FILES) scripts/version parser.h parser.c lexer.h \ $(DOC_FILES) scripts/version parser.h parser.c lexer.h \
lexer.c tests/onig.supp tests/torture/input0.json \ lexer.c tests/onig.supp tests/torture/input0.json \
tests/modules/.jq tests/modules/a.jq tests/modules/b/b.jq \ tests/modules/.jq tests/modules/a.jq tests/modules/b/b.jq \
tests/modules/c/c.jq tests/modules/c/d.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/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq \
tests/setup tests/jq.test tests/onig.test \ tests/setup tests/jq.test tests/onig.test \
tests/modules/data.json \ tests/modules/data.json \
tests/modules/syntaxerror/syntaxerror.jq \ tests/modules/syntaxerror/syntaxerror.jq \
tests/modules/test_bind_order.jq \ tests/modules/test_bind_order.jq \
tests/modules/test_bind_order0.jq \ tests/modules/test_bind_order0.jq \
tests/modules/test_bind_order1.jq \ tests/modules/test_bind_order1.jq \
tests/modules/test_bind_order2.jq \ tests/modules/test_bind_order2.jq \
jq.1.prebuilt jq.1.prebuilt
# README.md is expected in Github projects, good stuff in it, so we'll # README.md is expected in Github projects, good stuff in it, so we'll