Monotone-Parent: d5640b6a541fb6bc6c0cdd32d499796291e09473

Monotone-Revision: f69c7f912f9958f232e0641fbdf872d37a2aa9bd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-18T22:08:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-02-18 22:08:48 +00:00
parent 9227567a30
commit bb13d2b0b5
9 changed files with 13 additions and 9 deletions
+2 -3
View File
@@ -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 -2
View File
@@ -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 \
+1 -1
View File
@@ -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"
-28
View File
@@ -1,28 +0,0 @@
/* build.h - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef BUILD_H
#define BUILD_H
extern NSString *SOGoBuildDate;
#endif /* BUILD_H */
-26
View File
@@ -1,26 +0,0 @@
/* build.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSString.h>
NSString *SOGoBuildDate = SOGO_BUILD_DATE;