propagate from branch 'ca.inverse.sogo.1_3_12' (head 3c7106a946b0d9786d46c4f0c0a7e5bc1e5f8684)

to branch 'ca.inverse.sogo' (head f8e03957efcb10a5fb933549ff0f13db2842bece)

Monotone-Parent: 3c7106a946b0d9786d46c4f0c0a7e5bc1e5f8684
Monotone-Parent: f8e03957efcb10a5fb933549ff0f13db2842bece
Monotone-Revision: b4e03e63565eb6e8c043c7047716bde04729f417

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-12-29T17:50:58
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2011-12-29 17:50:58 +00:00
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -172,12 +172,12 @@ LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX="
LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
$(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
$(MAPISTORESOGO)_LDFLAGS += \
$(MAPISTORESOGO)_LIB_DIRS += \
-L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
$(LIBMAPI_LIBS) \
$(LIBMAPISTORE_LIBS)
$(SOGOBACKEND)_LDFLAGS += \
$(SOGOBACKEND)_LIB_DIRS += \
-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
-L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
$(LIBMAPI_LIBS) \
+3 -3
View File
@@ -2,6 +2,6 @@
# This file is included by library makefiles to set the version information
# of the executable.
MAJOR_VERSION=1
MINOR_VERSION=3
SUBMINOR_VERSION=12
MAJOR_VERSION=2
MINOR_VERSION=0
SUBMINOR_VERSION=0