diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-11-02 16:26:46 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-11-02 16:26:46 -0800 |
| commit | 7dab40dc51a8205402e32d13b2c5c49c03a44b4d (patch) | |
| tree | f44f73f0c58c36178b8a64f33f1120fe375caed9 | |
| parent | 601908591b553b87901bb1122ff4e29d1decd6b1 (diff) | |
| parent | f4702fd1d57273b86d0510ce14c6db1a5372f4b4 (diff) | |
Merge branch 'master' into cmake
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.old | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -29,6 +29,6 @@ scanners.c *.zip bstrlib.txt -commonmark.dSYM/* -commonmark build +cmark.dSYM/* +cmark diff --git a/Makefile.old b/Makefile.old index 8ebefce..8c229be 100644 --- a/Makefile.old +++ b/Makefile.old @@ -1,5 +1,5 @@ CFLAGS?=-g -O3 -Wall -Wextra -std=c99 -Isrc -Wno-missing-field-initializers -fPIC $(OPTCFLAGS) -LDFLAGS?=-g -O3 -Wall -Werror $(OPTLDFLAGS) +LDFLAGS?=-g -O3 -Wall -Werror -fPIC $(OPTLDFLAGS) SRCDIR?=src DATADIR?=data BENCHINP?=README.md @@ -109,7 +109,7 @@ upload-site: clean: -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcmark.so - -rm js/commonmark.js + -rm -f js/commonmark.js -rm -rf *.dSYM -rm -f README.html -rm -f spec.md fuzz.txt spec.html |