From a68df043bfbc7f8f38332143577877846631eca4 Mon Sep 17 00:00:00 2001
From: Michał Cichoń <michcic@gmail.com>
Date: Tue, 25 Aug 2015 19:58:37 +0200
Subject: Update build environment

 - remove faad2
 - remove mad
 - remove polarssl
 - remove pthreads
 - add libcurl
 - add vtparse with UTF8 support
 - update project to use Visual Studio 2015
---
 json-c/src/Makefile.am | 120 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 74 insertions(+), 46 deletions(-)

(limited to 'json-c/src/Makefile.am')

diff --git a/json-c/src/Makefile.am b/json-c/src/Makefile.am
index d4a7bbb..f330b7e 100644
--- a/json-c/src/Makefile.am
+++ b/json-c/src/Makefile.am
@@ -1,46 +1,74 @@
-include Makefile.am.inc
-
-EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
-SUBDIRS = . tests
-
-lib_LTLIBRARIES = libjson.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = json.pc
-
-libjsonincludedir = $(includedir)/json
-libjsoninclude_HEADERS = \
-	arraylist.h \
-	bits.h \
-	debug.h \
-	json.h \
-	json_config.h \
-	json_inttypes.h \
-	json_object.h \
-	json_object_private.h \
-	json_tokener.h \
-	json_util.h \
-	linkhash.h \
-	printbuf.h
-
-#libjsonx_includedir = $(libdir)/json-c-@VERSION@
-#
-#libjsonx_include_HEADERS = \
-#	json_config.h
-
-libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined
-
-libjson_la_SOURCES = \
-	arraylist.c \
-	debug.c \
-	json_object.c \
-	json_tokener.c \
-	json_util.c \
-	linkhash.c \
-	printbuf.c
-
-
-distclean-local:
-	-rm -rf $(testsubdir)
-	-rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub configure depcomp install-sh ltmain.sh missing
-
+include Makefile.am.inc
+
+EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+SUBDIRS = . tests
+
+lib_LTLIBRARIES = libjson-c.la 
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = json-c.pc
+
+libjson_cincludedir = $(includedir)/json-c
+libjson_cinclude_HEADERS = \
+	arraylist.h \
+	bits.h \
+	debug.h \
+	json.h \
+	json_config.h \
+	json_c_version.h \
+	json_inttypes.h \
+	json_object.h \
+	json_object_iterator.h \
+	json_object_private.h \
+	json_tokener.h \
+	json_util.h \
+	linkhash.h \
+	printbuf.h \
+	random_seed.h
+
+#libjsonx_includedir = $(libdir)/json-c-@VERSION@
+#
+#libjsonx_include_HEADERS = \
+#	json_config.h
+
+libjson_c_la_LDFLAGS = -version-info 3:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@
+
+libjson_c_la_SOURCES = \
+	arraylist.c \
+	debug.c \
+	json_c_version.c \
+	json_object.c \
+	json_object_iterator.c \
+	json_tokener.c \
+	json_util.c \
+	linkhash.c \
+	printbuf.c \
+	random_seed.c
+
+
+distclean-local:
+	-rm -rf $(testsubdir)
+	-rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub depcomp install-sh ltmain.sh missing
+	-rm -f INSTALL test-driver tests/Makefile.in compile
+
+maintainer-clean-local:
+	-rm -rf configure
+
+uninstall-local:
+	rm -rf "$(DESTDIR)@includedir@/json-c"
+	rm -f "$(DESTDIR)@includedir@/json"
+
+ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H
+
+Android.mk: Makefile.am
+	androgenizer -:PROJECT json-c \
+		-:SHARED libjson-c \
+		-:TAGS eng debug \
+		-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+		-:SOURCES $(libjson_c_la_SOURCES) $(nodist_libjson_c_la_SOURCES) \
+		-:CFLAGS $(DEFS) $(ANDROID_CFLAGS) $(libjson_c_la_CFLAGS) \
+		-:LDFLAGS $(libjson_c_la_LDFLAGS) $(libjson_c_la_LIBADD) \
+		-:HEADER_TARGET json-c \
+		-:HEADERS $(libjson_cinclude_HEADERS) \
+		-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+	> $@
-- 
cgit v1.2.3