Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master

Conflicts:
	Makefile.am
This commit is contained in:
Eric Haszlakiewicz
2014-02-11 23:05:54 -05:00
2 changed files with 27 additions and 1 deletions

View File

@@ -30,7 +30,7 @@ libjson_cinclude_HEADERS = \
#libjsonx_include_HEADERS = \
# json_config.h
libjson_c_la_LDFLAGS = -version-info 2:0:0 -no-undefined
libjson_c_la_LDFLAGS = -version-info 2:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@
libjson_c_la_SOURCES = \
arraylist.c \