summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2012-07-29 18:43:55 -0500
committerEric Haszlakiewicz <erh+git@nimenees.com>2012-07-29 18:43:55 -0500
commit8ce53f9d1e019995e3e08b20112b88b0262dc883 (patch)
tree6f00dd8fb9a9ab338cbcd9e18d33566ad7dd38d0
parent2f2180b70d262c6a58d0744e10b9b5ad4a226c6d (diff)
downloadjson-c-kdopen-rename_library.tar.gz
Note the rename in the ChangeLog, and update the instructions in the README file.kdopen-rename_library
-rw-r--r--ChangeLog10
-rw-r--r--README14
2 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e0fd4a3..42a3da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+
+NEXT.VERSION
+
+ * IMPORTANT: the name of the library has changed to libjson-c.so and
+ the header files are now in include/json-c.
+ The pkgconfig name has also changed from json to json-c.
+ You should change your build to use appropriate -I and -l options.
+ A compatibility shim is in place so builds using the old name will
+ continue to work, but that will be removed in the next release.
+
0.10
* Add a json_object_to_json_string_ext() function to allow output to be
diff --git a/README b/README
index 05ec274..20adddc 100644
--- a/README
+++ b/README
@@ -3,6 +3,8 @@ Building on Unix with git, gcc and autotools
Home page for json-c:
http://oss.metaparadigm.com/json-c/
+ Caution: do NOT use sources from svn.metaparadigm.com, they are old.
+
Github repo for json-c:
https://github.com/json-c/json-c
@@ -20,9 +22,15 @@ To build and run the test programs run
$ make check
-Linking to libjson
+Linking to libjson-c
If your system has pkgconfig then you can just add this to your makefile
-CFLAGS += $(shell pkg-config --cflags json)
-LDFLAGS += $(shell pkg-config --libs json)
+CFLAGS += $(shell pkg-config --cflags json-c)
+LDFLAGS += $(shell pkg-config --libs json-c)
+
+Without pkgconfig, you would do something like this:
+
+JSON_C_DIR=/path/to/json_c/install
+CFLAGS += -I$(JSON_C_DIR)/include/json-c
+LDFLAGS+= -L$(JSON_C_DIR)/lib -ljson-c