FS-2746 --resolve large xmlrpc update thanks garmt

libs/xmlrpc-c/src/Makefile

@@ -48,15 +48,18 @@ SHARED_LIBS_TO_INSTALL := $(TARGET_LIBRARY_NAMES)
 TRANSPORT_MODS =
 TRANSPORT_LIBDEP =
 ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-  TRANSPORT_MODS += $(BLDDIR)/lib/wininet_transport/xmlrpc_wininet_transport
+  TRANSPORT_MODS += blddir/lib/wininet_transport/xmlrpc_wininet_transport
   TRANSPORT_LIBDEP += $(shell wininet-config --libs)
 endif
 ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
-  TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport
+  TRANSPORT_MODS += blddir/lib/curl_transport/xmlrpc_curl_transport
+  TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction
+  TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti
+  TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread
   TRANSPORT_LIBDEP += $(shell curl-config --libs)
 endif
 ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-  TRANSPORT_MODS += $(BLDDIR)/lib/libwww_transport/xmlrpc_libwww_transport
+  TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
   TRANSPORT_LIBDEP += $(shell libwww-config --libs)
 endif
 
@@ -66,14 +69,18 @@ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
   XML_PARSER_LIBDEP_DEP =
 else
   XMLRPC_XML_PARSER = xmlrpc_expat
-  XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse
-  XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE)
+  XML_PARSER_LIBDEP = \
+    -Lblddir/lib/expat/xmlparse -lxmlrpc_xmlparse \
+    -Lblddir/lib/expat/xmltok -lxmlrpc_xmltok
+  XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
 endif
 
 # LIBxxx_OBJS is the list of object files that make up library libxxx.
 
 LIBXMLRPC_MODS = \
         double \
+	json \
+	parse_datetime \
 	parse_value \
         resource \
 	trace \
@@ -130,7 +137,7 @@ all: \
 # Extra dependencies to make parallel make work in spite of all the submakes
 # (See top level make file for details)
 ifeq ($MUST_BUILD_CLIENT),yes)
-cpp/all: $(BLDDIR)/transport_config.h
+cpp/all: $(BLDDIR)/transport_config.h $(TARGET_SHARED_LE_LIBS)
 endif
 
 #-----------------------------------------------------------------------------
@@ -160,7 +167,7 @@ $(LIBXMLRPC_SERVER): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc
+   -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
 
@@ -172,10 +179,9 @@ $(LIBXMLRPC_SERVER_ABYSS): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
   -L. -lxmlrpc_server \
   -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
-  -lxmlrpc
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_CGI = $(call shlibfn, libxmlrpc_server_cgi)
 
@@ -186,7 +192,8 @@ $(LIBXMLRPC_SERVER_CGI): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_CGI): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc_server -lxmlrpc
+  -L. -lxmlrpc_server \
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
 
@@ -199,10 +206,8 @@ $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
   $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
   $(TRANSPORT_MODS:%=%.osh)
 $(LIBXMLRPC_CLIENT): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
-  -L. -lxmlrpc \
-  $(TRANSPORT_LIBDEP)
-
+  $(TRANSPORT_LIBDEP) \
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 libxmlrpc.a: $(LIBXMLRPC_MODS:%=%.o)
 libxmlrpc.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)
@@ -229,20 +234,20 @@ libxmlrpc_client.a: LIBOBJECTS = \
 # Rules for these are in common.mk, courtesy of TARGET_MODS:
 
 BASIC_INCLUDES = \
-  -I$(BLDDIR) \
-  -I$(BLDDIR)/include \
-  -I$(SRCDIR)/include \
-  -I$(SRCDIR)/lib/util/include \
+  -Iblddir \
+  -Iblddir/include \
+  -Isrcdir/include \
+  -Isrcdir/lib/util/include \
 
 TRANSPORT_INCLUDES = \
-  -I$($SRCDIR)/lib/wininet_transport \
-  -I$(SRCDIR)/lib/curl_transport \
-  -I$(SRCDIR)/lib/libwww_transport \
+  -Isrcdir/lib/wininet_transport \
+  -Isrcdir/lib/curl_transport \
+  -Isrcdir/lib/libwww_transport \
 
 ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
   LIBXML_INCLUDES = $(shell xml2-config --cflags)
 else
-  LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
+  LIBXML_INCLUDES = -Isrcdir/lib/expat/xmlparse
 endif
 
 $(LIBXMLRPC_MODS:%=%.o) \
@@ -259,14 +264,12 @@ $(LIBXMLRPC_SERVER_MODS:%=%.osh): \
 
 $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.o) \
 $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh): \
-  INCLUDES = $(BASIC_INCLUDES) -I$(SRCDIR)/lib/abyss/src
+  INCLUDES = $(BASIC_INCLUDES) -Isrcdir/lib/abyss/src
 
 $(LIBXMLRPC_SERVER_CGI_MODS:%=%.o) \
 $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh): \
   INCLUDES = $(BASIC_INCLUDES)
 
-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-
 
 check:
 	$(MAKE) -C test runtests
@@ -275,12 +278,15 @@ check:
 .PHONY: install
 install: install-common $(SUBDIRS:%=%/install)
 
-.PHONY: clean clean-local distclean
-clean: clean-common clean-local $(SUBDIRS:%=%/clean)
+.PHONY: clean clean-local distclean distclean-local
+clean: clean-common clean-local
 clean-local:
 	$(MAKE) -C test clean
 
-distclean: clean-common clean-local distclean-common $(SUBDIRS:%=%/distclean)
+distclean: clean distclean-local distclean-common
+
+distclean-local:
+	$(MAKE) -C test distclean
 
 .PHONY: dep
 dep: $(SUBDIRS:%=%/dep) $(BLDDIR)/transport_config.h dep-common
@@ -293,4 +299,4 @@ xmlrpc_client.o xmlrpc_client.osh: $(BLDDIR)/version.h
 registry.o registry.osh: $(BLDDIR)/version.h
 version.o version.osh: $(BLDDIR)/version.h
 
-include Makefile.depend
+include depend.mk