Modify install names for library and include files
Changing root name of library to json-c, and also the directory where header files are installed to .../jsdon-c/*. This avoids clashes with other implementations of JSON libraries.
This commit is contained in:
10
Makefile.am
10
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
|
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
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = json.pc
|
pkgconfig_DATA = json-c.pc
|
||||||
|
|
||||||
libjsonincludedir = $(includedir)/json
|
libjsonincludedir = $(includedir)/json-c
|
||||||
libjsoninclude_HEADERS = \
|
libjsoninclude_HEADERS = \
|
||||||
arraylist.h \
|
arraylist.h \
|
||||||
bits.h \
|
bits.h \
|
||||||
@@ -27,9 +27,9 @@ libjsoninclude_HEADERS = \
|
|||||||
#libjsonx_include_HEADERS = \
|
#libjsonx_include_HEADERS = \
|
||||||
# json_config.h
|
# 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 \
|
arraylist.c \
|
||||||
debug.c \
|
debug.c \
|
||||||
json_object.c \
|
json_object.c \
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ AM_PROG_LIBTOOL
|
|||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
json.pc
|
json-c.pc
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
|
|||||||
libdir=@libdir@
|
libdir=@libdir@
|
||||||
includedir=@includedir@
|
includedir=@includedir@
|
||||||
|
|
||||||
Name: json
|
Name: json-c
|
||||||
Description: JSON implementation in C
|
Description: JSON implementation in C
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires:
|
Requires:
|
||||||
Libs: -L${libdir} -ljson
|
Libs: -L${libdir} -ljson-c
|
||||||
Cflags: -I${includedir}/json
|
Cflags: -I${includedir}/json-c
|
||||||
Reference in New Issue
Block a user