Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library

Conflicts:
	.gitignore
	Makefile.am
	configure.in
	printbuf.c
	test1.c
	test1.expected
This commit is contained in:
Eric Haszlakiewicz
2012-07-29 14:06:52 -05:00
7 changed files with 338 additions and 10 deletions

View File

@@ -3,12 +3,12 @@ include Makefile.am.inc
EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
SUBDIRS = . tests
lib_LTLIBRARIES = libjson.la
lib_LTLIBRARIES = libjson-c.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = json.pc
pkgconfig_DATA = json-c.pc
libjsonincludedir = $(includedir)/json
libjsonincludedir = $(includedir)/json-c
libjsoninclude_HEADERS = \
arraylist.h \
bits.h \
@@ -29,9 +29,9 @@ libjsoninclude_HEADERS = \
#libjsonx_include_HEADERS = \
# json_config.h
libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined
libjson_c_la_LDFLAGS = -version-info 1:0:1 -no-undefined
libjson_la_SOURCES = \
libjson_c_la_SOURCES = \
arraylist.c \
debug.c \
json_object.c \