Monotone-Parent: d5640b6a541fb6bc6c0cdd32d499796291e09473
Monotone-Revision: f69c7f912f9958f232e0641fbdf872d37a2aa9bd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-02-18T22:08:48 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
9227567a30
commit
bb13d2b0b5
|
@ -1,5 +1,7 @@
|
|||
2010-02-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoBuild.m: moved from Main/build.h to here.
|
||||
|
||||
* SoObjects/SOGo/SOGoProductLoader.m: moved from Main/ to here.
|
||||
|
||||
2010-02-18 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
|
|
@ -5,7 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
|
|||
include ../Version
|
||||
include ./Version
|
||||
|
||||
ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -D_GNU_SOURCE
|
||||
ADDITIONAL_INCLUDE_DIRS +=
|
||||
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
|
||||
|
||||
SOGOD = sogod
|
||||
|
@ -19,8 +19,7 @@ all::
|
|||
$(SOGOD)_OBJC_FILES += \
|
||||
sogod.m \
|
||||
SOGo.m \
|
||||
SOGo+DAV.m \
|
||||
build.m
|
||||
SOGo+DAV.m
|
||||
|
||||
-include GNUmakefile.preamble
|
||||
include $(GNUSTEP_MAKEFILES)/tool.make
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# compile settings
|
||||
|
||||
BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
|
||||
ADDITIONAL_CPPFLAGS += \
|
||||
-D_GNU_SOURCE \
|
||||
-DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
|
||||
|
@ -10,7 +9,7 @@ ADDITIONAL_CPPFLAGS += \
|
|||
ADDITIONAL_INCLUDE_DIRS += \
|
||||
-I../SOPE/ \
|
||||
-I../SoObjects/ \
|
||||
-I.. -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\""
|
||||
-I..
|
||||
|
||||
ADDITIONAL_LIB_DIRS += \
|
||||
-L../SoObjects/SOGo/SOGo.framework \
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
#import <WEExtensions/WEResourceManager.h>
|
||||
|
||||
#import <SOGo/SOGoBuild.h>
|
||||
#import <SOGo/SOGoCache.h>
|
||||
#import <SOGo/SOGoDAVAuthenticator.h>
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
|
@ -57,7 +58,6 @@
|
|||
#import <SOGo/WORequest+SOGo.h>
|
||||
#import <SOGo/NSObject+DAV.h>
|
||||
|
||||
#import "build.h"
|
||||
#import "NSException+Stacktrace.h"
|
||||
|
||||
#import "SOGo.h"
|
||||
|
|
|
@ -15,6 +15,7 @@ SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
|
|||
# SOGoGroupsFolder.h \
|
||||
# SOGoGroupFolder.h
|
||||
SOGo_HEADER_FILES = \
|
||||
SOGoBuild.h \
|
||||
SOGoProductLoader.h \
|
||||
\
|
||||
SOGoCache.h \
|
||||
|
@ -71,6 +72,7 @@ SOGo_HEADER_FILES = \
|
|||
# SOGoGroupsFolder.m \
|
||||
# SOGoGroupFolder.m
|
||||
SOGo_OBJC_FILES = \
|
||||
SOGoBuild.m \
|
||||
SOGoProductLoader.m \
|
||||
\
|
||||
SOGoCache.m \
|
||||
|
|
|
@ -2,8 +2,11 @@
|
|||
|
||||
SOGo_INCLUDE_DIRS += -I.. -I../../UI -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
|
||||
|
||||
BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
|
||||
|
||||
ADDITIONAL_CPPFLAGS += \
|
||||
-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
|
||||
-DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
|
||||
-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
|
||||
|
||||
SOGo_LIBRARIES_DEPEND_UPON += \
|
||||
-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
|
||||
|
|
|
@ -26,8 +26,6 @@
|
|||
#import <Foundation/NSPathUtilities.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
#import <Main/build.h>
|
||||
|
||||
#import <NGObjWeb/SoHTTPAuthenticator.h>
|
||||
#import <NGObjWeb/SoObjects.h>
|
||||
#import <NGObjWeb/WOResourceManager.h>
|
||||
|
@ -41,6 +39,7 @@
|
|||
#import <SOGo/NSCalendarDate+SOGo.h>
|
||||
#import <SOGo/NSObject+Utilities.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
#import <SOGo/SOGoBuild.h>
|
||||
#import <SOGo/SOGoContentObject.h>
|
||||
#import <SOGo/SOGoObject.h>
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
|
|
Loading…
Reference in New Issue