diff --git a/Makefile.am b/Makefile.am index 7f1abb1..eafaf6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,12 +2,12 @@ AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj -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 \ @@ -27,9 +27,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 \ diff --git a/configure.in b/configure.in index 49b3195..df0d82b 100644 --- a/configure.in +++ b/configure.in @@ -31,5 +31,5 @@ AM_PROG_LIBTOOL AC_OUTPUT([ Makefile -json.pc +json-c.pc ]) diff --git a/json.pc.in b/json-c.pc.in similarity index 67% rename from json.pc.in rename to json-c.pc.in index b3d140b..037739d 100644 --- a/json.pc.in +++ b/json-c.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: json +Name: json-c Description: JSON implementation in C Version: @VERSION@ Requires: -Libs: -L${libdir} -ljson -Cflags: -I${includedir}/json +Libs: -L${libdir} -ljson-c +Cflags: -I${includedir}/json-c