From: Eric Haszlakiewicz Date: Sun, 29 Jul 2012 19:06:52 +0000 (-0500) Subject: Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_... X-Git-Tag: json-c-0.11-20130402~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2d3ccf3af079d7b155b50e3974a5851af024383;p=thirdparty%2Fjson-c.git 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 --- c2d3ccf3af079d7b155b50e3974a5851af024383 diff --cc .gitignore index 6dfd3fd1,5ccc37ad..6da095d7 --- a/.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 f2d708ab,eafaf6a8..868cf977 --- a/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 f8f929ec,df0d82bd..79eafd11 --- a/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 +