138 lines
6.3 KiB
Diff
138 lines
6.3 KiB
Diff
diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am
|
|
--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 01:45:35.538074530 +0200
|
|
+++ zarafa-7.1.10/common/Makefile.am 2014-06-28 01:46:00.990073451 +0200
|
|
@@ -34,7 +34,7 @@
|
|
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
|
|
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
|
|
|
|
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static
|
|
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
|
|
rtfutil.cpp \
|
|
codepage.cpp \
|
|
@@ -60,7 +60,7 @@
|
|
MAPIErrors.cpp
|
|
libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
|
|
|
|
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static
|
|
+libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
libcommon_util_la_SOURCES = platform.cpp \
|
|
platform.linux.cpp \
|
|
md5.cpp \
|
|
@@ -101,14 +101,14 @@
|
|
libcommon_util_la_LIBADD += ${ICU_LIBS}
|
|
endif
|
|
|
|
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static
|
|
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
libcommon_ssl_la_SOURCES = \
|
|
SSLUtil.cpp \
|
|
ECChannelClient.cpp \
|
|
ECChannel.cpp
|
|
libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
|
|
|
|
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static
|
|
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
|
|
libcommon_service_la_LIBADD = ${MYSQL_LIBS}
|
|
|
|
diff -uNr zarafa-7.1.10.orig/common/zarafa.pc.in zarafa-7.1.10/common/zarafa.pc.in
|
|
--- zarafa-7.1.10.orig/common/zarafa.pc.in 2014-06-28 01:45:35.538074530 +0200
|
|
+++ zarafa-7.1.10/common/zarafa.pc.in 2014-06-28 01:46:00.991073451 +0200
|
|
@@ -7,5 +7,5 @@
|
|
Description: Zarafa custom development
|
|
Version: @ZARAFA_VERSION@
|
|
Requires:
|
|
-Libs: -L${libdir} -lmapi @PROG_LIBS@
|
|
+Libs: -L${libdir} -lmapi-@PACKAGE_VERSION@ @PROG_LIBS@
|
|
Cflags: -I${includedir}/mapi4linux/ -I${includedir}/zarafa/ -DUNICODE
|
|
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am
|
|
--- zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:45:35.505074531 +0200
|
|
+++ zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:46:00.990073451 +0200
|
|
@@ -16,6 +16,7 @@
|
|
|
|
|
|
|
|
+libarchiver_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
|
|
${top_builddir}/common/libcommon_mapi.la \
|
|
${top_builddir}/common/libcommon_util.la
|
|
@@ -53,6 +54,7 @@
|
|
ArchiveControlImpl.cpp ArchiveControlImpl.h \
|
|
ECDatabase.h ECDatabase.cpp
|
|
|
|
+libarchiver_core_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
|
|
|
|
zarafa_archiver_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \
|
|
diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am
|
|
--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 01:45:35.388074536 +0200
|
|
+++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 01:46:00.991073451 +0200
|
|
@@ -6,7 +6,7 @@
|
|
|
|
libfreebusy_la_includedir = $(includedir)/libfreebusy
|
|
|
|
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static
|
|
+libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
|
|
libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \
|
|
ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \
|
|
diff -uNr zarafa-7.1.10.orig/mapi4linux/src/Makefile.am zarafa-7.1.10/mapi4linux/src/Makefile.am
|
|
--- zarafa-7.1.10.orig/mapi4linux/src/Makefile.am 2014-06-28 01:45:35.424074535 +0200
|
|
+++ zarafa-7.1.10/mapi4linux/src/Makefile.am 2014-06-28 01:46:00.991073451 +0200
|
|
@@ -4,7 +4,7 @@
|
|
-DMAPICONFIGDIR=\"${MAPICONFIGDIR}\" \
|
|
-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy
|
|
|
|
-libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS)
|
|
+libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS) -release ${PACKAGE_VERSION}
|
|
|
|
libmapi_la_LIBADD = \
|
|
${top_builddir}/common/libcommon_mapi.la \
|
|
diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 01:45:35.417074535 +0200
|
|
+++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 01:46:00.991073451 +0200
|
|
@@ -9,6 +9,7 @@
|
|
AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP
|
|
endif
|
|
|
|
+libzarafacommon_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
libzarafacommon_la_SOURCES = SOAPUtils.cpp SOAPUtils.h \
|
|
SOAPAlloc.h \
|
|
SOAPHelpers.cpp SOAPHelpers.h \
|
|
diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 01:45:35.410074535 +0200
|
|
+++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 01:46:00.992073451 +0200
|
|
@@ -13,6 +13,7 @@
|
|
AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP
|
|
endif
|
|
|
|
+libserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
libserver_la_SOURCES = \
|
|
ZarafaCmd.cpp \
|
|
ECABObjectTable.cpp ECABObjectTable.h \
|
|
diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 01:45:35.405074535 +0200
|
|
+++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 01:49:07.358065554 +0200
|
|
@@ -7,6 +7,8 @@
|
|
|
|
libsoapserver_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS}
|
|
libsoapclient_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS}
|
|
+libsoapserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
+libsoapclient_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
|
|
nodist_libsoapserver_la_SOURCES = soapC.cpp soapServer.cpp
|
|
nodist_libsoapclient_la_SOURCES = soapC.cpp soapClient.cpp
|
|
diff -uNr zarafa-7.1.10.orig/zarafa-libsync/Makefile.am zarafa-7.1.10/zarafa-libsync/Makefile.am
|
|
--- zarafa-7.1.10.orig/zarafa-libsync/Makefile.am 2014-06-28 01:45:35.521074530 +0200
|
|
+++ zarafa-7.1.10/zarafa-libsync/Makefile.am 2014-06-28 01:46:00.992073451 +0200
|
|
@@ -11,6 +11,8 @@
|
|
|
|
libzarafasync_la_includedir = $(includedir)/libzarafasync
|
|
|
|
+libzarafasync_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
|
+
|
|
libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h \
|
|
ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h ECResyncSet.h
|
|
|