propagate from branch 'ca.inverse.sogo.1_3_12' (head 5e690b49423932996ff78f8ea2c1881306f09fa3)

to branch 'ca.inverse.sogo' (head 9582cd981c9aaa5c838be5f369c02ac3de3a914a)

Monotone-Parent: 5e690b49423932996ff78f8ea2c1881306f09fa3
Monotone-Parent: 9582cd981c9aaa5c838be5f369c02ac3de3a914a
Monotone-Revision: ed89880eae2839f1f4714817c94287a44216b46f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-12-30T13:38:23
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2011-12-30 13:38:23 +00:00
commit b98c309453
2 changed files with 5 additions and 5 deletions

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) \

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