Skip to content

Commit

Permalink
Modify install names for library and include files
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Keith Derrick committed Apr 6, 2012
1 parent 21d3706 commit 30dd367
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ AM_PROG_LIBTOOL

AC_OUTPUT([
Makefile
json.pc
json-c.pc
])
6 changes: 3 additions & 3 deletions json.pc.in → json-c.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 30dd367

Please sign in to comment.