From c2a841e43c2f9f5bda93fe2f5037e044bf95e837 Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 15 Oct 2004 16:05:21 +0000 Subject: [PATCH] compile fixes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@401 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/ChangeLog | 5 +++++ SOGo/UI/common.make | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog index 3733b804..8802f2fc 100644 --- a/SOGo/UI/ChangeLog +++ b/SOGo/UI/ChangeLog @@ -1,3 +1,8 @@ +2004-10-15 Marcus Mueller + + * common.make: updates for inline compilation, removed compatibility + for gstep-make < 1.10 + 2004-09-07 Marcus Mueller * README: Update with information regarding localization diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make index a5d5b10b..1912e2f7 100644 --- a/SOGo/UI/common.make +++ b/SOGo/UI/common.make @@ -11,19 +11,20 @@ ADDITIONAL_INCLUDE_DIRS += \ -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 +RELBUILD_DIR_libSOGo = \ + $(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME) +RELBUILD_DIR_libSOGoUI = \ + $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) +RELBUILD_DIR_libSOGoLogic = \ + $(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME) +RELBUILD_DIR_libOGoContentStore = \ + $(GNUSTEP_BUILD_DIR)/../../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) -ADDITIONAL_LIB_DIRS += \ - -L$(RELBUILD_DIR_libSOGoUI) \ - -L$(RELBUILD_DIR_libSOGoLogic) +ADDITIONAL_LIB_DIRS += \ + -L$(RELBUILD_DIR_libSOGo) \ + -L$(RELBUILD_DIR_libSOGoUI) \ + -L$(RELBUILD_DIR_libSOGoLogic) \ + -L$(RELBUILD_DIR_libOGoContentStore) ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib -- 2.39.5