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

Conflicts:
	.gitignore
	Makefile.am
	configure.in
	printbuf.c
	test1.c
	test1.expected

diff --cc .gitignore
index 6dfd3fd10a6281e6352fda5efb27025f38019714,5ccc37ad243227947e7a440b734c4fcd60a24bce..6da095d730951b9bd5a293fe35e539351e464578
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,39 -1,35 +1,39 @@@
 -.deps
 -.libs
 -aclocal.m4
 -autom4te.cache
 -config.guess
 -config.h
 -config.log
 -config.status
 -config.sub
 -configure
 -depcomp
 -install-sh
 -json.pc
 -libtool
 -ltmain.sh
 -Makefile
 -Makefile.in
 -missing
 -stamp-h1
 -stamp-h2
 -test1
 -test2
 -test4
 -testSubDir
 -test_parse_int64
 -test_parse
 -test_cast
 -test_null
 -Debug
 -Release
 +.deps/
 +.libs/
 +/aclocal.m4
 +/autom4te.cache
 +/config.guess
 +/json_config.h
 +/config.h
 +/config.log
 +/config.status
 +/config.sub
 +/configure
 +/depcomp
 +/install-sh
- /json.pc
++/json-c.pc
 +/libtool
 +/ltmain.sh
 +/Makefile
 +/Makefile.in
 +/missing
 +/stamp-h1
 +/stamp-h2
 +/tests/Makefile
 +/tests/Makefile.in
 +/tests/test1
 +/tests/test1Formatted
 +/tests/test2
 +/tests/test2Formatted
 +/tests/test4
 +/tests/testSubDir
 +/tests/test_parse_int64
 +/tests/test_parse
 +/tests/test_cast
 +/tests/test_null
 +/tests/test_printbuf
 +/Debug
 +/Release
  *.lo
  *.o
 -libjson.la
 -json-c.pc
 -json_config.h
 +/libjson.la

diff --cc Makefile.am
index f2d708abf356109ce019a7dfa32f67034b4bb8f1,eafaf6a8d9002e51c28a8e0bbb9aef7c0927eb7e..868cf9778b276116eaa86483e4f6ac169917ef0f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,14 -1,13 +1,14 @@@
 -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 +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 \

diff --cc configure.in
index f8f929ec81421be0fe3a7f59ffda194e1a4ce3dd,df0d82bdfdc003b3981cb3612c87e1da417cd9d5..79eafd11cde4e29078885a78f047925dd949ca03
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -31,12 -29,7 +31,12 @@@ AC_CHECK_FUNCS(strcasecmp strdup strndu
  
  AM_PROG_LIBTOOL
  
 -AC_OUTPUT([
 +AC_CONFIG_FILES([
  Makefile
- json.pc
+ json-c.pc
 +tests/Makefile
 +json-uninstalled.pc
  ])
 +
 +AC_OUTPUT
 +