Remove the old libjson.so name compatibility support. The library is only created...

diff --git a/Makefile.am b/Makefile.am
index 73e811692a2abd6cade6406ffa963e956d8d30b5..8f76acbf12ad4529fba8c3956321edb0656c1382 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,9 @@ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
 SUBDIRS = . tests
 
 lib_LTLIBRARIES = libjson-c.la 
-if ENABLE_OLDNAME_COMPAT
-lib_LTLIBRARIES+=libjson.la
-endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = json-c.pc
-if ENABLE_OLDNAME_COMPAT
-pkgconfig_DATA += json.pc
-endif
 
 libjson_cincludedir = $(includedir)/json-c
 libjson_cinclude_HEADERS = \
@@ -38,14 +32,6 @@ libjson_cinclude_HEADERS = \
 
 libjson_c_la_LDFLAGS = -version-info 2:0:0 -no-undefined
 
-if ENABLE_OLDNAME_COMPAT
-libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c
-
-# Temporary libjson library.  This will be removed after one release.
-libjson_la_LIBADD = -ljson-c
-endif
-
-
 libjson_c_la_SOURCES = \
        arraylist.c \
        debug.c \
@@ -65,22 +51,9 @@ distclean-local:
 maintainer-clean-local:
        -rm -rf configure
 
-if ENABLE_OLDNAME_COMPAT
-# Remove old headers and create a compatibility link
-install-data-hook:
-       if test -d "$(DESTDIR)@includedir@/json" ; then \
-               (cd "$(DESTDIR)@includedir@/json" && \
-               rm -f $(libjson_cinclude_HEADERS)) ; \
-               rmdir "$(DESTDIR)@includedir@/json" ; \
-       fi
-       test \! -e "$(DESTDIR)@includedir@/json" || rm "$(DESTDIR)@includedir@/json"
-       $(LN_S) json-c "$(DESTDIR)@includedir@/json"
-
 uninstall-local:
-       rm -f "$(DESTDIR)@includedir@/json"
        rm -rf "$(DESTDIR)@includedir@/json-c"
-
-endif
+       rm -f "$(DESTDIR)@includedir@/json"
 
 ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H
 

diff --git a/configure.in b/configure.in
index 64f9cbe57a96ae6b720569fa55c7c0f7f06ce56b..b6eae8c5736ecf6a9d2955334db8344bec6d135f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,14 +7,6 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_MAKE_SET
 
-AC_ARG_ENABLE(oldname-compat,
- AS_HELP_STRING([--disable-oldname-compat],
-   [Don't include the old libjson.so library and include/json directory.]),
-[],
-[enable_oldname_compat=yes]
-)
-AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno"])
-
 # Checks for programs.
 
 # Checks for libraries.
@@ -59,7 +51,6 @@ AM_PROG_LIBTOOL
 
 AC_CONFIG_FILES([
 Makefile
-json.pc
 json-c.pc
 tests/Makefile
 json-c-uninstalled.pc

diff --git a/json.pc.in b/json.pc.in
deleted file mode 100644 (file)
index 80e75d1..0000000
--- a/json.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: json-c
-Description: JSON implementation in C, compat shim.  Use json-c instead.
-Version: @VERSION@
-Requires: json-c
-Libs:
-Cflags: