SOURCES: xmlrpc-c-soname.patch - updated to 1.06.04
baggins
baggins at pld-linux.org
Mon Sep 4 13:53:59 CEST 2006
Author: baggins Date: Mon Sep 4 11:53:59 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 1.06.04
---- Files affected:
SOURCES:
xmlrpc-c-soname.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/xmlrpc-c-soname.patch
diff -u SOURCES/xmlrpc-c-soname.patch:1.3 SOURCES/xmlrpc-c-soname.patch:1.4
--- SOURCES/xmlrpc-c-soname.patch:1.3 Tue Feb 21 15:05:57 2006
+++ SOURCES/xmlrpc-c-soname.patch Mon Sep 4 13:53:54 2006
@@ -1,44 +1,90 @@
-diff -ur xmlrpc-c-1.03.10/Makefile.common xmlrpc-c-1.03.10.soname/Makefile.common
---- xmlrpc-c-1.03.10/Makefile.common 2005-06-06 02:27:10.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/Makefile.common 2006-01-11 16:44:45.984603250 +0100
-@@ -70,11 +70,11 @@
- $(BUILDDIR)/lib/util/casprintf.lo: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/util/Makefile $(notdir $@)
-
--$(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la: FORCE
-+$(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/expat/xmlparse/Makefile \
- $(notdir $@)
-
--$(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la: FORCE
-+$(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/expat/xmltok/Makefile \
- $(notdir $@)
-
-@@ -90,15 +90,15 @@
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/libwww_transport/Makefile \
- $(notdir $@)
-
--$(BUILDDIR)/src/libxmlrpc.la: FORCE
-+$(BUILDDIR)/src/libxmlrpc-c.la: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
- $(notdir $@)
-
--$(BUILDDIR)/src/libxmlrpc_client.la: FORCE
-+$(BUILDDIR)/src/libxmlrpc-c_client.la: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
- $(notdir $@)
-
--$(BUILDDIR)/src/libxmlrpc_server.la: FORCE
-+$(BUILDDIR)/src/libxmlrpc-c_server.la: FORCE
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
- $(notdir $@)
-
-Only in xmlrpc-c-1.03.10.soname: Makefile.common~
-diff -ur xmlrpc-c-1.03.10/configure.in xmlrpc-c-1.03.10.soname/configure.in
---- xmlrpc-c-1.03.10/configure.in 2006-01-11 16:54:42.321872000 +0100
-+++ xmlrpc-c-1.03.10.soname/configure.in 2006-01-11 16:45:17.102548000 +0100
-@@ -103,7 +103,7 @@
+diff -urN xmlrpc-c-1.06.04/Makefile.common xmlrpc-c-1.06.04-soname/Makefile.common
+--- xmlrpc-c-1.06.04/Makefile.common 2006-08-30 04:59:05.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/Makefile.common 2006-09-04 13:39:06.000000000 +0200
+@@ -65,12 +65,12 @@
+ # B is the revision number
+ # A minus C is the major number.
+ #
+-# So you would get libxmlrpc.so.A-C.C.B .
++# So you would get libxmlrpc-c.so.A-C.C.B .
+ #
+ # Our strategy is to make the library version numbers the same as the
+ # Xmlrpc-c version numbers except that we update the major number when and
+ # only when we make a non-backward-compatible change to the library. So
+-# e.g. libxmlrpc for Xmlrpc-c 1.06.01 is named libxmlrpc.so.3.6.1.
++# e.g. libxmlrpc-c for Xmlrpc-c 1.06.01 is named libxmlrpc-c.so.3.6.1.
+
+ LDFLAGS_VERSINFO = -version-info 9:4:6 # 3.6.4
+
+@@ -79,29 +79,29 @@
+ CURDIR := $(shell /bin/pwd)
+ endif
+
+-LIBXMLRPC_UTIL = $(BUILDDIR)/lib/libutil/libxmlrpc_util.la
+-LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc.la
+-LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc_client.la
+-LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc_server.la
+-LIBXMLRPC_SERVER_ABYSS = $(BUILDDIR)/src/libxmlrpc_server_abyss.la
+-LIBXMLRPC_SERVER_CGI = $(BUILDDIR)/src/libxmlrpc_server_cgi.la
+-LIBXMLRPC_ABYSS = $(BUILDDIR)/lib/abyss/src/libxmlrpc_abyss.la
+-LIBXMLRPC_XMLPARSE = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la
+-LIBXMLRPC_XMLTOK = $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
+-LIBXMLRPC_UTIL_A = $(BUILDDIR)/lib/libutil/.libs/libxmlrpc_util.a
+-LIBXMLRPC_A = $(BUILDDIR)/src/.libs/libxmlrpc.a
+-LIBXMLRPC_CLIENT_A = $(BUILDDIR)/src/.libs/libxmlrpc_client.a
+-LIBXMLRPC_SERVER_A = $(BUILDDIR)/src/.libs/libxmlrpc_server.a
+-LIBXMLRPC_SERVER_ABYSS_A = $(BUILDDIR)/src/.libs/libxmlrpc_server_abyss.a
+-LIBXMLRPC_SERVER_CGI_A = $(BUILDDIR)/src/.libs/libxmlrpc_server_cgi.a
+-LIBXMLRPC_ABYSS_A = $(BUILDDIR)/lib/abyss/src/.libs/libxmlrpc_abyss.a
+-LIBXMLRPC_XMLPARSE_A = $(BUILDDIR)/lib/expat/xmlparse/.libs/libxmlrpc_xmlparse.a
+-LIBXMLRPC_XMLTOK_A = $(BUILDDIR)/lib/expat/xmltok/.libs/libxmlrpc_xmltok.a
+-LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc_cpp.a
+-LIBXMLRPC++ = $(BUILDDIR)/src/cpp/libxmlrpc++.a
+-LIBXMLRPC_CLIENT++ = $(BUILDDIR)/src/cpp/libxmlrpc_client++.a
+-LIBXMLRPC_SERVER++ = $(BUILDDIR)/src/cpp/libxmlrpc_server++.a
+-LIBXMLRPC_SERVER_ABYSS++ = $(BUILDDIR)/src/cpp/libxmlrpc_server_abyss++.a
++LIBXMLRPC_UTIL = $(BUILDDIR)/lib/libutil/libxmlrpc-c_util.la
++LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc-c.la
++LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc-c_client.la
++LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc-c_server.la
++LIBXMLRPC_SERVER_ABYSS = $(BUILDDIR)/src/libxmlrpc-c_server_abyss.la
++LIBXMLRPC_SERVER_CGI = $(BUILDDIR)/src/libxmlrpc-c_server_cgi.la
++LIBXMLRPC_ABYSS = $(BUILDDIR)/lib/abyss/src/libxmlrpc-c_abyss.la
++LIBXMLRPC_XMLPARSE = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la
++LIBXMLRPC_XMLTOK = $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
++LIBXMLRPC_UTIL_A = $(BUILDDIR)/lib/libutil/.libs/libxmlrpc-c_util.a
++LIBXMLRPC_A = $(BUILDDIR)/src/.libs/libxmlrpc-c.a
++LIBXMLRPC_CLIENT_A = $(BUILDDIR)/src/.libs/libxmlrpc-c_client.a
++LIBXMLRPC_SERVER_A = $(BUILDDIR)/src/.libs/libxmlrpc-c_server.a
++LIBXMLRPC_SERVER_ABYSS_A = $(BUILDDIR)/src/.libs/libxmlrpc-c_server_abyss.a
++LIBXMLRPC_SERVER_CGI_A = $(BUILDDIR)/src/.libs/libxmlrpc-c_server_cgi.a
++LIBXMLRPC_ABYSS_A = $(BUILDDIR)/lib/abyss/src/.libs/libxmlrpc-c_abyss.a
++LIBXMLRPC_XMLPARSE_A = $(BUILDDIR)/lib/expat/xmlparse/.libs/libxmlrpc-c_xmlparse.a
++LIBXMLRPC_XMLTOK_A = $(BUILDDIR)/lib/expat/xmltok/.libs/libxmlrpc-c_xmltok.a
++LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc-c_cpp.a
++LIBXMLRPC++ = $(BUILDDIR)/src/cpp/libxmlrpc-c++.a
++LIBXMLRPC_CLIENT++ = $(BUILDDIR)/src/cpp/libxmlrpc-c_client++.a
++LIBXMLRPC_SERVER++ = $(BUILDDIR)/src/cpp/libxmlrpc-c_server++.a
++LIBXMLRPC_SERVER_ABYSS++ = $(BUILDDIR)/src/cpp/libxmlrpc-c_server_abyss++.a
+
+ CASPRINTF = $(BUILDDIR)/lib/util/casprintf.o
+
+@@ -117,9 +117,9 @@
+ LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
+ LDLIBS_XML = \
+ -L$(BUILDDIR)/lib/expat/xmlparse/.libs \
+- -lxmlrpc_xmlparse \
++ -lxmlrpc-c_xmlparse \
+ -L$(BUILDDIR)/lib/expat/xmltok/.libs \
+- -lxmlrpc_xmltok
++ -lxmlrpc-c_xmltok
+ else
+ LDLIBS_XML = $(shell xml2-config --libs)
+ endif
+diff -urN xmlrpc-c-1.06.04/configure.in xmlrpc-c-1.06.04-soname/configure.in
+--- xmlrpc-c-1.06.04/configure.in 2006-09-04 13:37:42.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/configure.in 2006-09-04 13:39:40.000000000 +0200
+@@ -104,7 +104,7 @@
dnl Set up the appropriate Makefile substitutions.
@@ -47,7 +93,7 @@
AC_SUBST(LIBXMLRPC_CLIENT_LA)
CLIENTTEST=clienttest
AC_SUBST(CLIENTTEST)
-@@ -149,7 +149,7 @@
+@@ -150,7 +150,7 @@
if test x"$enable_abyss_server" != xno; then
FEATURE_LIST="abyss-server $FEATURE_LIST"
ABYSS_SUBDIR=abyss
@@ -56,7 +102,7 @@
SERVERTEST=servertest
VALIDATEE=validatee
XMLRPC_ABYSS_H=xmlrpc_abyss.h
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
INTEROP_CLIENT_SUBDIR=
if test x"$enable_cplusplus" != xno; then
FEATURE_LIST="c++ $FEATURE_LIST"
@@ -65,20 +111,10 @@
CPPTEST=cpptest
XMLRPCCPP_H=XmlRpcCpp.h
-@@ -604,7 +604,7 @@
-
- EXTRA_XML_LIBS="$LIBXML2_LIBS"
- else
-- EXTRA_XML_LIBS="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
-+ EXTRA_XML_LIBS="-lxmlrpc-c_xmlparse -lxmlrpc-c_xmltok"
- fi
-
- AC_SUBST(EXTRA_XML_LIBS)
-Only in xmlrpc-c-1.03.10.soname: configure.in~
-diff -ur xmlrpc-c-1.03.10/lib/abyss/src/Makefile xmlrpc-c-1.03.10.soname/lib/abyss/src/Makefile
---- xmlrpc-c-1.03.10/lib/abyss/src/Makefile 2005-08-04 05:31:54.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/lib/abyss/src/Makefile 2006-01-11 16:45:51.308685750 +0100
-@@ -20,12 +20,12 @@
+diff -urN xmlrpc-c-1.06.04/lib/abyss/src/Makefile xmlrpc-c-1.06.04-soname/lib/abyss/src/Makefile
+--- xmlrpc-c-1.06.04/lib/abyss/src/Makefile 2006-06-10 18:51:46.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/lib/abyss/src/Makefile 2006-09-04 13:39:59.000000000 +0200
+@@ -18,12 +18,12 @@
INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/include -I$(SRCDIR)/lib/util/include
@@ -93,8 +129,8 @@
ABYSS_OBJS = \
-@@ -41,7 +41,7 @@
- conn.lo \
+@@ -43,7 +43,7 @@
+ trace.lo \
-libxmlrpc_abyss.la: $(ABYSS_OBJS)
@@ -102,61 +138,39 @@
$(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
$(ABYSS_OBJS):%.lo:%.c
-Only in xmlrpc-c-1.03.10.soname/lib/abyss/src: Makefile~
-diff -ur xmlrpc-c-1.03.10/lib/expat/xmlparse/Makefile.in xmlrpc-c-1.03.10.soname/lib/expat/xmlparse/Makefile.in
---- xmlrpc-c-1.03.10/lib/expat/xmlparse/Makefile.in 2004-10-16 23:41:28.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/lib/expat/xmlparse/Makefile.in 2006-01-11 16:46:53.592578250 +0100
-@@ -106,10 +106,10 @@
-
- INCLUDES = -I$(srcdir)/../xmltok
-
--lib_LTLIBRARIES = libxmlrpc_xmlparse.la
-+lib_LTLIBRARIES = libxmlrpc-c_xmlparse.la
-
--libxmlrpc_xmlparse_la_SOURCES = xmlparse.c xmlparse.h
--libxmlrpc_xmlparse_la_LDFLAGS = @VERSION_INFO@
-+libxmlrpc_c_xmlparse_la_SOURCES = xmlparse.c xmlparse.h
-+libxmlrpc_c_xmlparse_la_LDFLAGS = @VERSION_INFO@
-
- EXTRA_DIST = xmlparse.dsp
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -122,8 +122,8 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libxmlrpc_xmlparse_la_LIBADD =
--libxmlrpc_xmlparse_la_OBJECTS = xmlparse.lo
-+libxmlrpc_c_xmlparse_la_LIBADD =
-+libxmlrpc_c_xmlparse_la_OBJECTS = xmlparse.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -136,8 +136,8 @@
-
- TAR = gtar
- GZIP_ENV = --best
--SOURCES = $(libxmlrpc_xmlparse_la_SOURCES)
--OBJECTS = $(libxmlrpc_xmlparse_la_OBJECTS)
-+SOURCES = $(libxmlrpc_c_xmlparse_la_SOURCES)
-+OBJECTS = $(libxmlrpc_c_xmlparse_la_OBJECTS)
-
- all: all-redirect
- .SUFFIXES:
-@@ -211,8 +211,8 @@
-
- maintainer-clean-libtool:
-
--libxmlrpc_xmlparse.la: $(libxmlrpc_xmlparse_la_OBJECTS) $(libxmlrpc_xmlparse_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libxmlrpc_xmlparse_la_LDFLAGS) $(libxmlrpc_xmlparse_la_OBJECTS) $(libxmlrpc_xmlparse_la_LIBADD) $(LIBS)
-+libxmlrpc-c_xmlparse.la: $(libxmlrpc_c_xmlparse_la_OBJECTS) $(libxmlrpc_c_xmlparse_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libxmlrpc_c_xmlparse_la_LDFLAGS) $(libxmlrpc_c_xmlparse_la_OBJECTS) $(libxmlrpc_c_xmlparse_la_LIBADD) $(LIBS)
-
- tags: TAGS
-
-Only in xmlrpc-c-1.03.10.soname/lib/expat/xmlparse: Makefile.in~
-diff -ur xmlrpc-c-1.03.10/lib/expat/xmltok/Makefile xmlrpc-c-1.03.10.soname/lib/expat/xmltok/Makefile
---- xmlrpc-c-1.03.10/lib/expat/xmltok/Makefile 2005-05-05 23:37:43.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/lib/expat/xmltok/Makefile 2006-01-11 16:47:09.233555750 +0100
+diff -urN xmlrpc-c-1.06.04/lib/expat/xmlparse/Makefile xmlrpc-c-1.06.04-soname/lib/expat/xmlparse/Makefile
+--- xmlrpc-c-1.06.04/lib/expat/xmlparse/Makefile 2006-06-18 19:34:34.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/lib/expat/xmlparse/Makefile 2006-09-04 13:42:01.000000000 +0200
+@@ -16,7 +16,7 @@
+
+ default: all
+
+-all: libxmlrpc_xmlparse.la
++all: libxmlrpc-c_xmlparse.la
+
+ LIBXMLRPC_XMLPARSE_OBJS = xmlparse.lo
+
+@@ -26,7 +26,7 @@
+
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
+
+-libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS)
++libxmlrpc-c_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+@@ -34,7 +34,7 @@
+ $(LIBXMLRPC_XMLPARSE_OBJS):%.lo:%.c
+ $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $<
+
+-LTLIBRARIES_TO_INSTALL = libxmlrpc_xmlparse.la
++LTLIBRARIES_TO_INSTALL = libxmlrpc-c_xmlparse.la
+
+ .PHONY: install
+ install: install-common
+diff -urN xmlrpc-c-1.06.04/lib/expat/xmltok/Makefile xmlrpc-c-1.06.04-soname/lib/expat/xmltok/Makefile
+--- xmlrpc-c-1.06.04/lib/expat/xmltok/Makefile 2005-09-24 22:45:15.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/lib/expat/xmltok/Makefile 2006-09-04 13:42:13.000000000 +0200
@@ -20,7 +20,7 @@
include $(SRCDIR)/Makefile.common
@@ -180,24 +194,99 @@
$(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
$(LIBXMLRPC_XMLTOK_OBJS):%.lo:%.c
-Only in xmlrpc-c-1.03.10.soname/lib/expat/xmltok: Makefile~
-diff -ur xmlrpc-c-1.03.10/src/Makefile xmlrpc-c-1.03.10.soname/src/Makefile
---- xmlrpc-c-1.03.10/src/Makefile 2005-07-01 05:13:03.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/src/Makefile 2006-01-11 16:56:50.565886750 +0100
-@@ -37,8 +37,8 @@
- LIBXML = $(LIBXML2_LIBS)
- else
- LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
-- LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
-+ LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
- endif
+diff -urN xmlrpc-c-1.06.04/lib/libutil/Makefile xmlrpc-c-1.06.04-soname/lib/libutil/Makefile
+--- xmlrpc-c-1.06.04/lib/libutil/Makefile 2006-04-23 02:55:40.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/lib/libutil/Makefile 2006-09-04 13:42:26.000000000 +0200
+@@ -1,5 +1,5 @@
+ ###############################################################################
+-# This directory builds libxmlrpc_util, which contains utility
++# This directory builds libxmlrpc-c_util, which contains utility
+ # functions that are used by the Xmlprc-c # libraries, and also
+ # directly by Xmlrpc-c programs.
+ #
+@@ -23,7 +23,7 @@
+
+ default: all
- ABYSS_INCLUDES = -I$(SRCDIR)/lib/abyss/src
-@@ -72,15 +72,15 @@
- $(TRANSPORT_INCLUDES) \
- $(LIBXML_INCLUDES) \
+-all: libxmlrpc_util.la
++all: libxmlrpc-c_util.la
+
+ LIBXMLRPC_UTIL_OBJS = \
+ casprintf.lo \
+@@ -40,7 +40,7 @@
+
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
+
+-libxmlrpc_util.la: $(LIBXMLRPC_UTIL_OBJS)
++libxmlrpc-c_util.la: $(LIBXMLRPC_UTIL_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+@@ -48,7 +48,7 @@
+ $(LIBXMLRPC_UTIL_OBJS):%.lo:%.c
+ $(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $<
+
+-LTLIBRARIES_TO_INSTALL = libxmlrpc_util.la
++LTLIBRARIES_TO_INSTALL = libxmlrpc-c_util.la
+
+ .PHONY: install
+ install: install-common
+diff -urN xmlrpc-c-1.06.04/lib/util/Makefile xmlrpc-c-1.06.04-soname/lib/util/Makefile
+--- xmlrpc-c-1.06.04/lib/util/Makefile 2005-10-05 20:05:07.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/lib/util/Makefile 2006-09-04 13:42:42.000000000 +0200
+@@ -7,7 +7,7 @@
+ # modules, the libraries will conflict with each other.
+ #
+ # So a utility function that is to be used by libraries (and, optionally,
+-# programs) should go in libxmlrpc_util. libxmlrpc_util is a prerequisite
++# programs) should go in libxmlrpc-c_util. libxmlrpc-c_util is a prerequisite
+ # for many Xmlrpc-c libraries, gets included in a program link only once,
+ # and uses external symbol names that have the "xmlrpc_" prefix to avoid
+ # collision with users' code.
+@@ -49,4 +49,4 @@
+ .PHONY: dep
+ dep: dep-common
+
+-install:
+\ No newline at end of file
++install:
+diff -urN xmlrpc-c-1.06.04/src/Makefile xmlrpc-c-1.06.04-soname/src/Makefile
+--- xmlrpc-c-1.06.04/src/Makefile 2006-07-30 05:07:28.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/src/Makefile 2006-09-04 13:44:50.000000000 +0200
+@@ -69,17 +69,17 @@
+ # may require the necessary -L options in addition.
+
+ LIBXMLRPC_CLIENT_OBJS = xmlrpc_client.lo xmlrpc_client_global.lo
+-LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc_util -lxmlrpc
++LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c
+
+ LIBXMLRPC_SERVER_OBJS = registry.lo system_method.lo
+-LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc_util -lxmlrpc
++LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c
+
+ LIBXMLRPC_SERVER_ABYSS_OBJS = xmlrpc_server_abyss.lo
+ LIBXMLRPC_SERVER_ABYSS_LIBDEP = \
+- -lxmlrpc_util -lxmlrpc_server -L$(ABYSS_LIBDIR) -lxmlrpc_abyss -lxmlrpc
++ -lxmlrpc-c_util -lxmlrpc-c_server -L$(ABYSS_LIBDIR) -lxmlrpc-c_abyss -lxmlrpc-c
+
+ LIBXMLRPC_SERVER_CGI_OBJS = xmlrpc_server_cgi.lo
+-LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc_util -lxmlrpc_server -lxmlrpc
++LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc-c_util -lxmlrpc-c_server -lxmlrpc-c
+
+ LIBXMLRPC_OBJS = \
+ trace.lo \
+@@ -95,7 +95,7 @@
+ xmlrpc_utf8.lo \
+ xmlrpc_authcookie.lo \
+
+-LIBXMLRPC_LIBDEP = -lxmlrpc_util
++LIBXMLRPC_LIBDEP = -lxmlrpc-c_util
+
+ LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS)
+
+@@ -117,15 +117,15 @@
+ # some code that exploits an Abyss server, and you don't need to have a
+ # built Abyss server to build it.
-TARGET_LTLIBRARIES = libxmlrpc.la libxmlrpc_server.la \
- libxmlrpc_server_abyss.la
@@ -215,93 +304,64 @@
endif
all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%/all)
-@@ -89,19 +89,19 @@
+@@ -137,24 +137,24 @@
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD)
- LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
-libxmlrpc.la: $(LIBXMLRPC_OBJS)
+libxmlrpc-c.la: $(LIBXMLRPC_OBJS)
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
-
--libxmlrpc_client.la: xmlrpc_client.lo $(TRANSPORT_OBJS) $(CASPRINTF_OBJ)
-+libxmlrpc-c_client.la: xmlrpc_client.lo $(TRANSPORT_OBJS) $(CASPRINTF_OBJ)
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
-
--libxmlrpc_server.la: xmlrpc_registry.lo
-+libxmlrpc-c_server.la: xmlrpc_registry.lo
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+ $(LIBXMLRPC_OBJS) $(LIBXMLRPC_LIBDEP)
--libxmlrpc_server_abyss.la: xmlrpc_server_abyss.lo
-+libxmlrpc-c_server_abyss.la: xmlrpc_server_abyss.lo
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
-
--libxmlrpc_server_cgi.la: xmlrpc_server_cgi.lo
-+libxmlrpc-c_server_cgi.la: xmlrpc_server_cgi.lo
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+-libxmlrpc_client.la: $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS)
++libxmlrpc-c_client.la: $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+ $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS) \
+ $(LIBXMLRPC_CLIENT_LIBDEP) $(TRANSPORT_LIBDEP) \
+
+-libxmlrpc_server.la: $(LIBXMLRPC_SERVER_OBJS)
++libxmlrpc-c_server.la: $(LIBXMLRPC_SERVER_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+ $(LIBXMLRPC_SERVER_OBJS) $(LIBXMLRPC_SERVER_LIBDEP)
+
+-libxmlrpc_server_abyss.la: $(LIBXMLRPC_SERVER_ABYSS_OBJS)
++libxmlrpc-c_server_abyss.la: $(LIBXMLRPC_SERVER_ABYSS_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+ $(LIBXMLRPC_SERVER_ABYSS_OBJS) $(LIBXMLRPC_SERVER_ABYSS_LIBDEP)
+
+-libxmlrpc_server_cgi.la: $(LIBXMLRPC_SERVER_CGI_OBJS)
++libxmlrpc-c_server_cgi.la: $(LIBXMLRPC_SERVER_CGI_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
+ $(LIBXMLRPC_SERVER_CGI_OBJS) $(LIBXMLRPC_SERVER_CGI_LIBDEP)
+
+diff -urN xmlrpc-c-1.06.04/src/cpp/Makefile xmlrpc-c-1.06.04-soname/src/cpp/Makefile
+--- xmlrpc-c-1.06.04/src/cpp/Makefile 2006-06-19 16:16:46.000000000 +0200
++++ xmlrpc-c-1.06.04-soname/src/cpp/Makefile 2006-09-04 13:43:05.000000000 +0200
+@@ -14,15 +14,15 @@
- CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
-Only in xmlrpc-c-1.03.10.soname/src: Makefile~
-diff -ur xmlrpc-c-1.03.10/src/cpp/Makefile xmlrpc-c-1.03.10.soname/src/cpp/Makefile
---- xmlrpc-c-1.03.10/src/cpp/Makefile 2005-11-23 04:13:11.000000000 +0100
-+++ xmlrpc-c-1.03.10.soname/src/cpp/Makefile 2006-01-11 16:55:43.925722000 +0100
-@@ -18,8 +18,8 @@
- LIBXML = $(LIBXML2_LIBS)
- else
- LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
-- LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
-+ LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
- endif
+ default: all
- ifeq ($(ENABLE_LIBXML2),yes)
-@@ -28,9 +28,9 @@
- XMLRPC_XML_PARSER = xmlrpc_expat.lo
- endif
+-# libxmlrpc_cpp is the legacy C++ wrapper library. The others are the
++# libxmlrpc-c_cpp is the legacy C++ wrapper library. The others are the
+ # more elaborate replacements.
--LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc.la
--LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc_server.la
--LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc_client.la
-+LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc-c.la
-+LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc-c_server.la
-+LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc-c_client.la
-
- LIBXMLRPCPP_OBJS = girmem.o value.o fault.o outcome.o param_list.o xml.o
- LIBXMLRPC_SERVERPP_OBJS = registry.o
-@@ -62,15 +62,15 @@
- # it obfuscates the build process), I haven't figured out yet how to
- # get the shared libraries to build for all the platforms.
+ TARGET_LIBRARY_NAMES := \
+- libxmlrpc_cpp \
+- libxmlrpc++ \
+- libxmlrpc_server++ \
+- libxmlrpc_server_abyss++ \
+- libxmlrpc_client++ \
++ libxmlrpc-c_cpp \
++ libxmlrpc-c++ \
++ libxmlrpc-c_server++ \
++ libxmlrpc-c_server_abyss++ \
++ libxmlrpc-c_client++ \
--# libxmlrpc_cpp.a is the legacy C++ wrapper library. The others are the
-+# libxmlrpc-c_cpp.a is the legacy C++ wrapper library. The others are the
- # more elaborate replacements.
+ STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES)
- TARGET_LIBRARIES = \
-- libxmlrpc_cpp.a \
-- libxmlrpc++.a \
-- libxmlrpc_server++.a \
-- libxmlrpc_server_abyss++.a \
-- libxmlrpc_client++.a \
-+ libxmlrpc-c_cpp.a \
-+ libxmlrpc-c++.a \
-+ libxmlrpc-c_server++.a \
-+ libxmlrpc-c_server_abyss++.a \
-+ libxmlrpc-c_client++.a \
-
- TARGET_PROGS = cpptest
-
-@@ -85,34 +85,34 @@
-
- LDFLAGS += $(LADD)
-
--cpptest:%:%.o libxmlrpc_server_abyss++.a libxmlrpc_server++.a \
-- libxmlrpc_client++.a libxmlrpc++.a libxmlrpc_cpp.a \
-+cpptest:%:%.o libxmlrpc-c_server_abyss++.a libxmlrpc-c_server++.a \
-+ libxmlrpc-c_client++.a libxmlrpc-c++.a libxmlrpc-c_cpp.a \
- $(LIBXMLRPC) $(LIBXMLRPC_SERVER) $(LIBXMLRPC_CLIENT) $(LIBXML)
- $(LIBTOOL) --mode=link $(CXXLD) -o $@ $(LDFLAGS) $^
+@@ -107,27 +107,27 @@
- LIBLDFLAGS = $(LADD)
+ all: $(TARGET_LIBRARIES)
-libxmlrpc_cpp.a: XmlRpcCpp.o
+libxmlrpc-c_cpp.a: XmlRpcCpp.o
@@ -332,57 +392,87 @@
-rm -f $@
$(AR) cru $@ $^
$(RANLIB) $@
-Only in xmlrpc-c-1.03.10.soname/src/cpp: Makefile~
-diff -ur xmlrpc-c-1.03.10/tools/Makefile.common xmlrpc-c-1.03.10.soname/tools/Makefile.common
---- xmlrpc-c-1.03.10/tools/Makefile.common 2005-10-06 18:15:38.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/tools/Makefile.common 2006-01-11 16:57:25.844091500 +0100
-@@ -11,8 +11,8 @@
- CLIENT_LDFLAGS += $(shell wininet-config --libs)
- endif
-
--LIBEXPAT = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
-+LIBEXPAT = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
-
- ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
- LIBXML = $(LIBXML2_LIBS)
-@@ -20,10 +20,10 @@
- LIBXML = $(LIBEXPAT)
- endif
-
--LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc.la
--LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc_cpp.a
--LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc_client.la
--LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc_server.la
-+LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc-c.la
-+LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc-c_cpp.a
-+LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc-c_client.la
-+LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc-c_server.la
-
- XMLRPC_LIBS = $(LIBXMLRPC) $(LIBXMLRPC_CPP) $(LIBXMLRPC_CLIENT) \
- $(LIBXMLRPC_SERVER) $(LIBXML)
-Only in xmlrpc-c-1.03.10.soname/tools: Makefile.common~
-diff -ur xmlrpc-c-1.03.10/xmlrpc-c-config.in xmlrpc-c-1.03.10.soname/xmlrpc-c-config.in
---- xmlrpc-c-1.03.10/xmlrpc-c-config.in 2005-08-04 05:31:52.000000000 +0200
-+++ xmlrpc-c-1.03.10.soname/xmlrpc-c-config.in 2006-01-11 16:50:17.989352250 +0100
-@@ -54,13 +54,13 @@
+diff -urN xmlrpc-c-1.06.04/src/cpp/unix.make xmlrpc-c-1.06.04-soname/src/cpp/unix.make
+--- xmlrpc-c-1.06.04/src/cpp/unix.make 2005-12-08 01:10:15.000000000 +0100
++++ xmlrpc-c-1.06.04-soname/src/cpp/unix.make 2006-09-04 13:43:58.000000000 +0200
+@@ -6,18 +6,18 @@
+ # This is to be included by 'Makefile'. Most of the make variables here
+ # come from the main make file.
+
+-libxmlrpc_cpp.$(SHLIB_SUFFIX).$(MAJ).$(MIN): XmlRpcCpp.o
++libxmlrpc-c_cpp.$(SHLIB_SUFFIX).$(MAJ).$(MIN): XmlRpcCpp.o
+ $(SHLIB_RULE)
+
+-libxmlrpc++.$(SHLIB_SUFFIX).$(MAJ).$(MIN): $(LIBXMLRPCPP_OBJS)
++libxmlrpc-c++.$(SHLIB_SUFFIX).$(MAJ).$(MIN): $(LIBXMLRPCPP_OBJS)
+ $(SHLIB_RULE)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/xmlrpc-c-soname.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list