blob: d434dd922091b67efdb3ddd5221a1f5f644ada96 (
plain)
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
|
--- provider/server/Makefile.in~ 2010-08-03 10:42:59.000000000 +0100
+++ provider/server/Makefile.in 2010-08-06 10:17:15.391932752 +0100
@@ -265,7 +265,7 @@
$(MYSQL_INCLUDES) $(GSOAP_CFLAGS) $(SSL_CFLAGS) $(SSL_HAS_EVP_PKEY_CMP) $(EPOLL_CFLAGS)
zarafa_server_LDFLAGS = ${DL_LIBS} -Wl,-E
-zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICONV_LIBS) \
+zarafa_server_LDADD = $(INTL_LIBS) $(ICONV_LIBS) \
${top_builddir}/provider/libserver/libserver.la \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapserver.la \
@@ -273,7 +273,7 @@
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) $(UUID_LIBS) -lrt
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \
--- ECtools/zarafa-stats/Makefile.in~ 2010-08-03 10:42:54.000000000 +0100
+++ ECtools/zarafa-stats/Makefile.in 2010-08-06 10:23:27.988995191 +0100
@@ -249,7 +249,7 @@
${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
- -lncurses
+ -lncurses $(UUID_LIBS)
zarafa_stats_SOURCES = zarafa-stats.cpp
all: all-am
|