merge of '2a09733287aae014c2abab945596b03e401444ae'

and 'edcc0786cecbc0129855dd749f12c72557d2a08f'

Monotone-Parent: 2a09733287aae014c2abab945596b03e401444ae
Monotone-Parent: edcc0786cecbc0129855dd749f12c72557d2a08f
Monotone-Revision: 809e26f6797e99b0dc3440bc4da33da4677540d9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-25T17:40:26
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-01-25 17:40:26 +00:00
commit d9f84565ff
4 changed files with 4 additions and 1 deletions

View File

@ -5,6 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../../Version
include ./Version
NEEDS_GUI=no
BUNDLE_EXTENSION = .SOGo
BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
WOBUNDLE_EXTENSION = $(BUNDLE_EXTENSION)

View File

@ -13,4 +13,4 @@ ADDITIONAL_LIB_DIRS += \
-L../SoObjects/SOGo/SOGo.framework -lSOGo \
-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
-L/usr/local/lib -L/usr/lib
-L/usr/local/lib -L/usr/lib

View File

@ -3,6 +3,7 @@
include ../../config.make
include $(GNUSTEP_MAKEFILES)/common.make
NEEDS_GUI=no
BUNDLE_NAME = SOGoElements
BUNDLE_EXTENSION = .wox
BUNDLE_INSTALL_DIR = $(SOPE_WOXBUILDERS)

View File

@ -5,6 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../../Version
-include ./Version
NEEDS_GUI=no
BUNDLE_EXTENSION = .SOGo
BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)