1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff -NrU5 xmlrpc-c-1.16.08.orig/lib/abyss/src/Makefile xmlrpc-c-1.16.08/lib/abyss/src/Makefile
--- xmlrpc-c-1.16.08.orig/lib/abyss/src/Makefile 2009-01-21 04:26:28.000000000 +0100
+++ xmlrpc-c-1.16.08/lib/abyss/src/Makefile 2009-01-21 05:08:56.000000000 +0100
@@ -57,15 +57,10 @@
ABYSS_SHLIB = $(call shlibfn,libxmlrpc_abyss)
#ABYSS_SHLIB is e.g. libxmlrpc_abyss.so.3.1
ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss)
#ABYSS_SHLIBLE is e.g. libxmlrpc_abyss.so
-# LIBDEP is the shared libraries on which libxmlrpc_abyss depends.
-# The runtime loader should load these libraries when it loads libxmlrpc_abyss.
-
-LIBDEP = $(LIBXMLRPC_UTIL)
-
ifneq ($(SHARED_LIB_TYPE),NONE)
TARGET_SHARED_LIBS := $(ABYSS_SHLIB) $(ABYSS_SHLIBLE)
endif
# This 'common.mk' dependency makes sure the symlinks get built before
@@ -76,12 +71,17 @@
.PHONY: all
all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
-$(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) $(LIBDEP)
-$(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh) $(LIBDEP)
+$(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) \
+ $(LIBXMLRPC_UTIL)
+$(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh)
+$(ABYSS_SHLIB): LIBDEP = -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+ifeq ($(ENABLE_ABYSS_THREADS),yes)
+ $(ABYSS_SHLIB): LIBDEP += -lpthread
+endif
# Rule for this is in common.mk, courtesy of TARGET_STATIC_LIBRARIES:
libxmlrpc_abyss.a: $(TARGET_MODS:%=%.o)
libxmlrpc_abyss.a: LIBOBJECTS = $(TARGET_MODS:%=%.o)
diff -NrU5 xmlrpc-c-1.16.08.orig/src/cpp/Makefile xmlrpc-c-1.16.08/src/cpp/Makefile
--- xmlrpc-c-1.16.08.orig/src/cpp/Makefile 2008-12-29 05:12:25.000000000 +0100
+++ xmlrpc-c-1.16.08/src/cpp/Makefile 2009-01-21 05:06:12.000000000 +0100
@@ -138,14 +138,18 @@
LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) \
$(LIBXMLRPC_ABYSS) \
+ $(LIBXMLRPC_SERVER_ABYSS) \
+ $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
+ $(call shlibfn, libxmlrpc_server++) \
+ $(LIBXMLRPC_UTIL) \
$(LIBXMLRPC)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
$(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \
- -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc
+ -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_server++ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
$(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \
$(call shliblefn, libxmlrpc_server++) \
|
GitWeb
