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 604f8b77014c7af3cbf6e1ac1f0e1b193ca3a6dd..e4124d053b5986bcba1ee5b98a9a9ba2c14182e7 100644 (file)
--- 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 6ad999c79efe5c7852e13e69fb60f039838b4201..dd1f4e76d000e7c35d9ffe048f9483814ba76bdf 100644 (file)
--- 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 6521cbf3dacf0ab2b4f9c10db46164bf94ef3d5e..dc276a7e51d05a852e1d3f5197eed046d92851e1 100644 (file)
--- 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)