From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Sun, 26 Sep 2004 15:14:29 +0000 (+0000)
Subject: use UI/common.make in makefiles
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=876f4c5946522c92201e4c7e03111afe5b541954;p=scalable-opengroupware.org

use UI/common.make in makefiles


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@316 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/UI/Contacts/GNUmakefile b/SOGo/UI/Contacts/GNUmakefile
index b405c824..9a2ca9a2 100644
--- a/SOGo/UI/Contacts/GNUmakefile
+++ b/SOGo/UI/Contacts/GNUmakefile
@@ -1,10 +1,8 @@
 # $Id$
 
-include $(GNUSTEP_MAKEFILES)/common.make
+include ../common.make
 
-BUNDLE_NAME        = ContactsUI
-BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
+BUNDLE_NAME = ContactsUI
 
 ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct
 
diff --git a/SOGo/UI/Contacts/GNUmakefile.preamble b/SOGo/UI/Contacts/GNUmakefile.preamble
index 065ed2ad..a8e09ec0 100644
--- a/SOGo/UI/Contacts/GNUmakefile.preamble
+++ b/SOGo/UI/Contacts/GNUmakefile.preamble
@@ -1,30 +1 @@
-# $Id$
-
-ADDITIONAL_INCLUDE_DIRS += \
-	-I..		\
-	-I../..		\
-	-I../../..	\
-	-I../../SoObjects
-
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libSOGoUI = \
-		$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
-	RELBUILD_DIR_libSOGoLogic = \
-		$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libSOGoUI		= ../SOGoUI/$(GNUSTEP_OBJ_DIR)
-	RELBUILD_DIR_libSOGoLogic	= ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
-endif
-
-ContactsUI_LIB_DIRS +=			\
-	-L$(RELBUILD_DIR_libSOGoUI)	\
-	-L$(RELBUILD_DIR_libSOGoLogic)
-
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
-
-ContactsUI_BUNDLE_LIBS += \
-	-lNGObjWeb 					\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC -lNGiCal		\
-	-lSOGoLogic -lSOGoUI				\
+# compile flags
diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 1ab08601..f4699a82 100644
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -1,10 +1,8 @@
 # GNUstep makefile
 
-include $(GNUSTEP_MAKEFILES)/common.make
+include ../common.make
 
-BUNDLE_NAME        = MailerUI
-BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
+BUNDLE_NAME = MailerUI
 
 MailerUI_PRINCIPAL_CLASS = MailerUIProduct
 
diff --git a/SOGo/UI/Mailer/GNUmakefile.preamble b/SOGo/UI/Mailer/GNUmakefile.preamble
index 25790009..a8e09ec0 100644
--- a/SOGo/UI/Mailer/GNUmakefile.preamble
+++ b/SOGo/UI/Mailer/GNUmakefile.preamble
@@ -1,33 +1 @@
-# $Id$
-
-ADDITIONAL_INCLUDE_DIRS += \
-	-I.. -I../.. -I../../..
-
-ADDITIONAL_INCLUDE_DIRS += \
-	-I..		\
-	-I../..		\
-	-I../../..	\
-	-I../../SoObjects
-
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libSOGoUI = \
-		$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
-	RELBUILD_DIR_libSOGoLogic = \
-		$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libSOGoUI		= ../SOGoUI/$(GNUSTEP_OBJ_DIR)
-	RELBUILD_DIR_libSOGoLogic	= ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
-endif
-
-MailerUI_LIB_DIRS +=			\
-	-L$(RELBUILD_DIR_libSOGoUI)	\
-	-L$(RELBUILD_DIR_libSOGoLogic)
-
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
-
-MailerUI_BUNDLE_LIBS += \
-	-lNGObjWeb 					\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC -lNGiCal		\
-	-lSOGoLogic -lSOGoUI				\
+# compile flags
diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index 31c3aaae..d5d3d360 100644
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -20,7 +20,6 @@
 */
 // $Id$
 
-
 #include <SOGoUI/UIxComponent.h>
 
 @interface UIxMailEditor : UIxComponent
diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile
index 580fdf07..e4e1372a 100644
--- a/SOGo/UI/Scheduler/GNUmakefile
+++ b/SOGo/UI/Scheduler/GNUmakefile
@@ -1,10 +1,8 @@
 # $Id$
 
-include $(GNUSTEP_MAKEFILES)/common.make
+include ../common.make
 
-BUNDLE_NAME        = SchedulerUI
-BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
+BUNDLE_NAME = SchedulerUI
 
 SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct
 
diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index 2338f666..08b0584f 100644
--- a/SOGo/UI/Scheduler/GNUmakefile.preamble
+++ b/SOGo/UI/Scheduler/GNUmakefile.preamble
@@ -1,30 +1 @@
-# $Id$
-
-ADDITIONAL_INCLUDE_DIRS += \
-	-I..		\
-	-I../..		\
-	-I../../..	\
-	-I../../SoObjects
-
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libSOGoUI = \
-		$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
-	RELBUILD_DIR_libSOGoLogic = \
-		$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libSOGoUI		= ../SOGoUI/$(GNUSTEP_OBJ_DIR)
-	RELBUILD_DIR_libSOGoLogic	= ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
-endif
-
-SchedulerUI_LIB_DIRS +=			\
-	-L$(RELBUILD_DIR_libSOGoUI)	\
-	-L$(RELBUILD_DIR_libSOGoLogic)
-
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
-
-SchedulerUI_BUNDLE_LIBS += \
-	-lNGObjWeb					\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
-	-lXmlRpc -lDOM -lSaxObjC -lNGiCal		\
-	-lSOGoLogic -lSOGoUI				\
+# compile settings
diff --git a/SOGo/UI/Scheduler/NSCalendarDate+UIx.m b/SOGo/UI/Scheduler/NSCalendarDate+UIx.m
index 53c4647f..079de1d6 100644
--- a/SOGo/UI/Scheduler/NSCalendarDate+UIx.m
+++ b/SOGo/UI/Scheduler/NSCalendarDate+UIx.m
@@ -28,17 +28,17 @@
 - (NSCalendarDate *)dayOfWeeK:(unsigned)_day 
   offsetFromSunday:(unsigned)_offset
 {
-    unsigned dayOfWeek, distance;
+  unsigned dayOfWeek, distance;
     
-    /* perform "locale" correction */
-    dayOfWeek = (7 + [self dayOfWeek] - _offset) % 7;
+  /* perform "locale" correction */
+  dayOfWeek = (7 + [self dayOfWeek] - _offset) % 7;
 
-    _day = (_day % 7);
-    if(_day == dayOfWeek)
-        return self;
+  _day = (_day % 7);
+  if(_day == dayOfWeek)
+    return self;
 
-    distance = _day - dayOfWeek;
-    return [self dateByAddingYears:0 months:0 days:distance];
+  distance = _day - dayOfWeek;
+  return [self dateByAddingYears:0 months:0 days:distance];
 }
 
 /* this implies that monday is the start of week! */
diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index 24614f4f..a5d5b10b 100644
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -6,22 +6,33 @@ BUNDLE_EXTENSION   = .SOGo
 BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
 
 ADDITIONAL_INCLUDE_DIRS += \
-	-I.. -I../.. -I../../..
+	-I..		\
+	-I../..		\
+	-I../../..	\
+	-I../../SoObjects
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 	RELBUILD_DIR_libSOGoUI = \
 		$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
+	RELBUILD_DIR_libSOGoLogic = \
+		$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
 else
 	RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR)
+	RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI)
+ADDITIONAL_LIB_DIRS += \
+	-L$(RELBUILD_DIR_libSOGoUI)	\
+	-L$(RELBUILD_DIR_libSOGoLogic)
+
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
 	-lSOGoUI		\
 	-lSOGo -lSOGoLogic	\
+	-lOGoContentStore	\
+	-lGDLAccess		\
 	-lNGObjWeb		\
-	-lNGMime -lNGiCal	\
+	-lNGMime -lNGiCal -lNGLdap \
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC