From 0844a05649d5a11d5b3b45baa2ab3738e7f730a4 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 8 Jun 2004 11:35:15 +0000
Subject: [PATCH] fixed compilation on OSX

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@27 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 ZideStore/UI-X/ChangeLog                      |  4 ++++
 ZideStore/UI-X/Common/GNUmakefile.preamble    |  6 ++++++
 ZideStore/UI-X/Common/common.h                | 11 +++++------
 ZideStore/UI-X/Scheduler/GNUmakefile          |  4 ++++
 ZideStore/UI-X/Scheduler/GNUmakefile.preamble |  6 ++++++
 ZideStore/UI-X/Scheduler/common.h             | 11 +++++------
 6 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 ZideStore/UI-X/Common/GNUmakefile.preamble
 create mode 100644 ZideStore/UI-X/Scheduler/GNUmakefile.preamble

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index 6e1fefc4..14da14a4 100644
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-08  Helge Hess  <helge.hess@opengroupware.org>
+	
+	* */common.h, GNUmakefile.preamble.: fixed for OSX compile
+
 2004-06-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* Common/images: added a bunch of images from OGo
diff --git a/ZideStore/UI-X/Common/GNUmakefile.preamble b/ZideStore/UI-X/Common/GNUmakefile.preamble
new file mode 100644
index 00000000..d8d84475
--- /dev/null
+++ b/ZideStore/UI-X/Common/GNUmakefile.preamble
@@ -0,0 +1,6 @@
+# $Id$
+
+CommonUI_BUNDLE_LIBS += \
+	-lNGObjWeb -lNGScripting \
+	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
+	-lXmlRpc -lDOM -lSaxObjC
diff --git a/ZideStore/UI-X/Common/common.h b/ZideStore/UI-X/Common/common.h
index d179d308..093af0b3 100644
--- a/ZideStore/UI-X/Common/common.h
+++ b/ZideStore/UI-X/Common/common.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -23,11 +23,10 @@
 #import <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
+#  include <Foundation/exceptions/GeneralExceptions.h>
 #elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <FoundationExt/NSObjectMacros.h>
-#  import <FoundationExt/NSString+Ext.h>
-#  import <FoundationExt/GeneralExceptions.h>
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
 #endif
 
 #include <NGExtensions/NGExtensions.h>
diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile
index 0ddea8bc..27c47d03 100644
--- a/ZideStore/UI-X/Scheduler/GNUmakefile
+++ b/ZideStore/UI-X/Scheduler/GNUmakefile
@@ -30,7 +30,11 @@ SchedulerUI_RESOURCE_FILES += \
 	images/next_week.gif		\
 	images/previous_week.gif	\
 
+ifeq ($(FOUNDATION_LIB),apple)
+ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12
+else
 ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12
+endif
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I. \
diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
new file mode 100644
index 00000000..41f31b86
--- /dev/null
+++ b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
@@ -0,0 +1,6 @@
+# $Id$
+
+SchedulerUI_BUNDLE_LIBS += \
+	-lNGObjWeb -lNGScripting \
+	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
+	-lXmlRpc -lDOM -lSaxObjC
diff --git a/ZideStore/UI-X/Scheduler/common.h b/ZideStore/UI-X/Scheduler/common.h
index d179d308..093af0b3 100644
--- a/ZideStore/UI-X/Scheduler/common.h
+++ b/ZideStore/UI-X/Scheduler/common.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -23,11 +23,10 @@
 #import <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
+#  include <Foundation/exceptions/GeneralExceptions.h>
 #elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <FoundationExt/NSObjectMacros.h>
-#  import <FoundationExt/NSString+Ext.h>
-#  import <FoundationExt/GeneralExceptions.h>
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
 #endif
 
 #include <NGExtensions/NGExtensions.h>
-- 
2.39.2