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 b405c824d2102417bccec941c882f85cd60aac64..9a2ca9a20aca01d1c15244660c90dcd11ad43951 100644 (file)
--- 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 065ed2adc8aec76119ffad54284063c0a5860b63..a8e09ec01e023cfc3cd0f8846d071df7568947b1 100644 (file)
--- 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 1ab086018f0dc28f09bce8448035439c63027614..f4699a823e575358c50b0b9f8774354707f31eb2 100644 (file)
--- 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 25790009bbb780dd5b5ac6a9d28abc1db75f86f7..a8e09ec01e023cfc3cd0f8846d071df7568947b1 100644 (file)
--- 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 31c3aaaed790a3fa37a1e2c2f392ccbbcf412f8e..d5d3d3608771747d365839f437a7e266fe758cd2 100644 (file)
--- 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 580fdf073490cb770d15a9edcf3e6c5b2027b563..e4e1372a1fabb0aa3fbcf82dcc8f4f01f4f7dfe8 100644 (file)
--- 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 2338f66606327bc433e119809e95ad20c1be8bf9..08b0584f2d2bc7555b0ddd44d47d1bc7e0121c64 100644 (file)
--- 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 53c4647fb89a8dc491028265f233ed5a91fdf568..079de1d6b9a29e6ba05c9576cd250ebcdf53efc7 100644 (file)
--- 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 24614f4f612b9266b1b5b19fc398f934ed1f48c3..a5d5b10b7eed8f3c013604a6ff2f6fb0c85154f1 100644 (file)
--- 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