From 30f3cf33ac197003a4477b3122798016b1382b0b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 24 Apr 2008 01:04:11 +0000
Subject: [PATCH] Monotone-Parent: add5712466eee5d26701d06e05d1e2771f7dd4fa
 Monotone-Revision: 0077efee9316ca1e744e82d28a7eb1b8c54b05ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-04-24T01:04:11
Monotone-Branch: ca.inverse.sogo
---
 Main/GNUmakefile.preamble           |  2 +-
 OGoContentStore/GNUmakefile         |  1 -
 SOPE/GDLContentStore/GNUmakefile    |  1 -
 SOPE/NGCards/GNUmakefile            |  1 -
 SoObjects/SOGo/GNUmakefile          | 20 ++++++++++----------
 SoObjects/SOGo/GNUmakefile.preamble |  6 ++----
 UI/SOGoUI/GNUmakefile               |  1 -
 7 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 991110f9f..89fd3d01a 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -11,7 +11,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I.. -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\""
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
+	-L../SoObjects/SOGo/SOGo.framework  \
 	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
 
diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index 1ef0149f1..b697967e1 100644
--- a/OGoContentStore/GNUmakefile
+++ b/OGoContentStore/GNUmakefile
@@ -12,7 +12,6 @@ TYPEMODELS_DIR = $(SOGO_TYPEMODELS)
 libOGoContentStore_HEADER_FILES_DIR         = .
 libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore
 libOGoContentStore_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libOGoContentStore_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 ADDITIONAL_INCLUDE_DIRS += -I../SOPE
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj
diff --git a/SOPE/GDLContentStore/GNUmakefile b/SOPE/GDLContentStore/GNUmakefile
index eca654b2f..ca90d7836 100644
--- a/SOPE/GDLContentStore/GNUmakefile
+++ b/SOPE/GDLContentStore/GNUmakefile
@@ -14,7 +14,6 @@ endif
 
 libGDLContentStore_PCH_FILE = common.h
 libGDLContentStore_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libGDLContentStore_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 libGDLContentStore_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 TOOL_NAME = gcs_ls gcs_mkdir gcs_cat gcs_recreatequick gcs_gensql
diff --git a/SOPE/NGCards/GNUmakefile b/SOPE/NGCards/GNUmakefile
index 252fbbdcb..563c21346 100644
--- a/SOPE/NGCards/GNUmakefile
+++ b/SOPE/NGCards/GNUmakefile
@@ -15,7 +15,6 @@ endif
 libNGCards_HEADER_FILES_DIR         = .
 libNGCards_HEADER_FILES_INSTALL_DIR = /NGCards
 libNGCards_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libNGCards_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 libNGCards_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGCards_HEADER_FILES =  		\
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index 4a00f5d59..29432aa3c 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -5,7 +5,9 @@ include $(GNUSTEP_MAKEFILES)/common.make
 -include ../../Version
 -include ./Version
 
-LIBRARY_NAME = libSOGo
+FRAMEWORK_NAME = SOGo
+
+SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
 
 TOOL_NAME = \
 # 	agenor_email2uid	\
@@ -13,13 +15,9 @@ TOOL_NAME = \
 # 	agenor_emails4uid	\
 # 	agenor_defaults
 
-libSOGo_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libSOGo_INSTALL_DIR=$(SOGO_SYSLIBDIR)
+SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
-libSOGo_HEADER_FILES_DIR         = .
-libSOGo_HEADER_FILES_INSTALL_DIR = /SOGo
-
-libSOGo_HEADER_FILES = \
+SOGo_HEADER_FILES = \
 	SOGoCache.h			\
 	SOGoObject.h			\
 	SOGoContentObject.h		\
@@ -56,7 +54,7 @@ libSOGo_HEADER_FILES = \
 	\
 	WORequest+SOGo.h
 
-libSOGo_OBJC_FILES = \
+SOGo_OBJC_FILES = \
 	SOGoCache.m			\
 	SOGoObject.m			\
 	SOGoContentObject.m		\
@@ -94,6 +92,9 @@ libSOGo_OBJC_FILES = \
 	\
 	WORequest+SOGo.m
 
+SOGo_RESOURCE_FILES = \
+	DAVReportMap.plist
+
 # tools
 
 agenor_email2uid_OBJC_FILES  += agenor_email2uid.m
@@ -106,10 +107,9 @@ ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
-include ../common.make
 ifneq ($(FHS_INSTALL_ROOT),)
 GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
 endif
-include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/framework.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index f49ab0b73..c2edd5290 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -1,10 +1,8 @@
 # compilation settings
 
-libSOGo_INCLUDE_DIRS += -I.. -I../../..
+SOGo_INCLUDE_DIRS += -I.. -I../.. -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
 
-SYSTEM_LIB_DIR += -L/usr/local/lib
-
-libSOGo_LIBRARIES_DEPEND_UPON += \
+SOGo_LIBRARIES_DEPEND_UPON += \
 	-lOGoContentStore	\
 	-lGDLAccess		\
 	-lNGObjWeb		\
diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index aca9621e1..7b76d73e9 100644
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -11,7 +11,6 @@ LIBRARY_NAME = libSOGoUI
 libSOGoUI_HEADER_FILES_DIR         = .
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
 libSOGoUI_INTERFACE_VERSION	   = $(MAJOR_VERSION).$(MINOR_VERSION)
-libSOGoUI_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 libSOGoUI_HEADER_FILES +=	\
 	\