From 3821d1aa7fde7c8ad9ecf9d3f837ab781420118f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Sun, 29 Nov 2009 04:02:47 +0000
Subject: [PATCH] Monotone-Parent: 26c7b9bc924807f585951102db6677a54ac082b3
 Monotone-Revision: 2fdf0ead0781ef2362dd389811d5db44ca4cc84a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-29T04:02:47
Monotone-Branch: ca.inverse.sogo
---
 Main/GNUmakefile                             | 1 -
 Main/GNUmakefile.preamble                    | 3 +--
 {Main => SoObjects/SOGo}/SOGoStartupLogger.h | 0
 {Main => SoObjects/SOGo}/SOGoStartupLogger.m | 0
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename {Main => SoObjects/SOGo}/SOGoStartupLogger.h (100%)
 rename {Main => SoObjects/SOGo}/SOGoStartupLogger.m (100%)

diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index da53c5370..d8d1b3398 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -20,7 +20,6 @@ $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
 	SOGoProductLoader.m	\
-	SOGoStartupLogger.m	\
 	build.m
 
 -include GNUmakefile.preamble
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 5686586b3..89fd3d01a 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -4,8 +4,7 @@ BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
 ADDITIONAL_CPPFLAGS += \
         -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
         -DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
-        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION) \
-	-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
+        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I../SoObjects/	\
diff --git a/Main/SOGoStartupLogger.h b/SoObjects/SOGo/SOGoStartupLogger.h
similarity index 100%
rename from Main/SOGoStartupLogger.h
rename to SoObjects/SOGo/SOGoStartupLogger.h
diff --git a/Main/SOGoStartupLogger.m b/SoObjects/SOGo/SOGoStartupLogger.m
similarity index 100%
rename from Main/SOGoStartupLogger.m
rename to SoObjects/SOGo/SOGoStartupLogger.m