Skip to content

Commit

Permalink
Merge branch 'master' into tcase_tags
Browse files Browse the repository at this point in the history
  • Loading branch information
cdentyou committed Jun 8, 2016
2 parents 8694d33 + 824d402 commit 5b77afd
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 7 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# EditorConfig
# http://EditorConfig.org

# top-most EditorConfig file
root = true

# LF end-of-line, insert an empty new line and UTF-8
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8

[makefile,Makefile]
indent_style = tab
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
# Temp files
*~
*.bak
*.backup
\#*
.\#*
*\#
*.sav
*.save
*.autosav
*.autosave

# Generated binaries
*.o
*.lo
*.la
*.Po
*.Plo

# Generated folders
bin/
build/
release/
debug/

build-aux
Makefile.in
Makefile
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ tutorial. The tutorial is also available as `info check`.

Check has the following dependencies:

* automake-1.9.6 (1.11.3 on OS X if you are using /usr/bin/ar)
* autoconf-2.59
* libtool-1.5.22
* pkg-config-0.20
* texinfo-4.7 (for documentation)
* [automake](https://www.gnu.org/software/automake/)-1.9.6 (1.11.3 on OS X if you are using /usr/bin/ar)
* [autoconf](https://www.gnu.org/software/autoconf/)-2.59
* [libtool](https://www.gnu.org/software/libtool/)-1.5.22
* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)-0.20
* [texinfo](https://www.gnu.org/software/texinfo/)-4.7 (for documentation)
* tetex-bin (or any texinfo-compatible TeX installation, for documentation)
* POSIX sed
* POSIX [sed](https://en.wikipedia.org/wiki/Sed)

The versions specified may be higher than those actually needed.

Expand Down
2 changes: 1 addition & 1 deletion check.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ includedir=@includedir@

Name: Check
Description: A unit test framework for C
URL: http://check.sourceforge.net
URL: https://libcheck.github.io/check/
Version: @VERSION@
Requires.private: @LIBSUBUNIT_PC@
Libs: -L${libdir} -lcheck
Expand Down

0 comments on commit 5b77afd

Please sign in to comment.