From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 21 Jun 2004 10:02:34 +0000 (+0000)
Subject: Slight fixes for the build process using recent gnustep-make
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd082ec0a39f0de1ad6e4652a939a0a4265c976;p=scalable-opengroupware.org

Slight fixes for the build process using recent gnustep-make


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

diff --git a/ZideStore/UI-X/Common/GNUmakefile b/ZideStore/UI-X/Common/GNUmakefile
index 604f8b77..e4124d05 100644
--- a/ZideStore/UI-X/Common/GNUmakefile
+++ b/ZideStore/UI-X/Common/GNUmakefile
@@ -77,6 +77,6 @@ ADDITIONAL_INCLUDE_DIRS += \
 # make
 
 -include GNUmakefile.preamble
-include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
diff --git a/ZideStore/UI-X/Common/GNUmakefile.preamble b/ZideStore/UI-X/Common/GNUmakefile.preamble
index 6ad999c7..dd1f4e76 100644
--- a/ZideStore/UI-X/Common/GNUmakefile.preamble
+++ b/ZideStore/UI-X/Common/GNUmakefile.preamble
@@ -1,11 +1,13 @@
 # $Id$
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libZideStoreCommonUI=$(GNUSTEP_BUILD_DIR)/libZideStoreCommonUI
+	RELBUILD_DIR_libZideStoreCommonUI = $(GNUSTEP_OBJ_DIR)
 else
-	RELBUILD_DIR_libZideStoreCommonUI=.
+	RELBUILD_DIR_libZideStoreCommonUI = .
 endif
 
+libZideStoreCommonUI_LIBRARIES_DEPEND_UPON += -lNGObjWeb
+
 CommonUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI)
 
 CommonUI_BUNDLE_LIBS += \
diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
index 6521cbf3..dc276a7e 100644
--- a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
+++ b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
@@ -1,9 +1,10 @@
 # $Id$
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libZideStoreCommonUI=$(GNUSTEP_BUILD_DIR)/libZideStoreCommonUI
+	RELBUILD_DIR_libZideStoreCommonUI = \
+		$(GNUSTEP_BUILD_DIR)/../Common/$(GNUSTEP_OBJ_DIR_NAME)
 else
-	RELBUILD_DIR_libZideStoreCommonUI=../Common
+	RELBUILD_DIR_libZideStoreCommonUI = ../Common
 endif
 
 SchedulerUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI)