From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 12 Sep 2006 14:32:08 +0000 (+0000)
Subject: play nicely with gnustep-make 1.13.0
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7d01e2b9580572f2b6276490adf7e99fd2f8da;p=sope

play nicely with gnustep-make 1.13.0


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1360 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 55f2510e..7d0476e5 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* woapp-gs.make, wobundle-gs.make: play nicely with
+	  gnustep-make 1.13.0, where WHICH_LIB_SCRIPT has been removed
+	  (v4.5.249)
+
 2006-09-10  Helge Hess  <helge.hess@opengroupware.org>
 
 	* DynamicElements/WOForm.m: added 'fragmentIdentifier' binding to
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 7e1713ab..419a41ac 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=248
+SUBMINOR_VERSION:=249
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179
diff --git a/sope-appserver/NGObjWeb/woapp-gs.make b/sope-appserver/NGObjWeb/woapp-gs.make
index e2ca691d..b0310efd 100644
--- a/sope-appserver/NGObjWeb/woapp-gs.make
+++ b/sope-appserver/NGObjWeb/woapp-gs.make
@@ -117,6 +117,14 @@ GNUSTEP_WOAPPS = $(GNUSTEP_INSTALLATION_DIR)/WOApps
         woapp-localized-resource-files
 
 # Libraries that go before the WO libraries
+ifndef $(WHICH_LIB_SCRIPT)
+ALL_WO_LIBS =								\
+	$(ALL_LIB_DIRS)							\
+	$(ADDITIONAL_WO_LIBS) $(AUXILIARY_WO_LIBS) $(WO_LIBS)	\
+	$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS)			\
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS)	\
+        $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
+else
 ALL_WO_LIBS =								\
     $(shell $(WHICH_LIB_SCRIPT)						\
 	$(ALL_LIB_DIRS)							\
@@ -126,7 +134,7 @@ ALL_WO_LIBS =								\
         $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)		\
 	debug=$(debug) profile=$(profile) shared=$(shared)		\
 	libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
-
+endif
 
 # Don't include these definitions the first time make is invoked. This part is
 # included when make is invoked the second time from the %.build rule (see
diff --git a/sope-appserver/NGObjWeb/wobundle-gs.make b/sope-appserver/NGObjWeb/wobundle-gs.make
index 43371245..affcb739 100644
--- a/sope-appserver/NGObjWeb/wobundle-gs.make
+++ b/sope-appserver/NGObjWeb/wobundle-gs.make
@@ -122,10 +122,64 @@ TALL_WOBUNDLE_LIBS = $(ADDITIONAL_WO_LIBS) $(AUXILIARY_WO_LIBS) $(WO_LIBS) \
 	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) \
 	$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
 #ALL_WOBUNDLE_LIBS = 
+ifndef $(WHICH_LIB_SCRIPT)
+ALL_WOBUNDLE_LIBS = $(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS)
+else
 ALL_WOBUNDLE_LIBS = \
-    $(shell $(WHICH_LIB_SCRIPT) $(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS) \
+    $(shell $(WHICH_LIB_SCRIPT)	\
+	$(ALL_LIB_DIRS) $(TALL_WOBUNDLE_LIBS) 	\
 	debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
 	shared_libext=$(SHARED_LIBEXT))
+endif
+
+internal-wobundle-all_:: $(GNUSTEP_OBJ_DIR) \
+                          build-bundle-dir \
+                          build-bundle
+
+WOBUNDLE_DIR_NAME = $(GNUSTEP_INSTANCE:=$(WOBUNDLE_EXTENSION))
+WOBUNDLE_FILE = \
+    $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE)
+WOBUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX)/$(d))
+WOBUNDLE_WEBSERVER_RESOURCE_DIRS =  $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(WOBUNDLE_DIR_NAME)/Resources/WebServer/$(d))
+
+ifeq ($(strip $(LANGUAGES)),)
+  LANGUAGES="English"
+endif
+
+
+build-bundle-dir:: $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX) \
+                   $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
+                   $(WOBUNDLE_RESOURCE_DIRS)
+
+$(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
+	@$(MKDIRS) $(WOBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
+
+$(WOBUNDLE_RESOURCE_DIRS):
+	@$(MKDIRS) $(WOBUNDLE_RESOURCE_DIRS)
+
+build-bundle:: $(WOBUNDLE_FILE) \
+               wobundle-components \
+               wobundle-resource-files \
+               wobundle-localized-resource-files \
+               wobundle-localized-webresource-files \
+               wobundle-webresource-files
+
+
+$(WOBUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
+	$(WOBUNDLE_LD) $(WOBUNDLE_LDFLAGS) \
+	                $(ALL_LDFLAGS) -o $(LDOUT)$(WOBUNDLE_FILE) \
+			$(OBJ_FILES_TO_LINK) \
+	                $(ALL_WOBUNDLE_LIBS)
+
+wobundle-components :: $(WOBUNDLE_DIR_NAME)
+ifneq ($(strip $(COMPONENTS)),)
+	@(echo "Linking components into the bundle wrapper..."; \
+        cd $(WOBUNDLE_DIR_NAME)/$(WORSRCDIRINFIX); \
+        for component in $(COMPONENTS); do \
+	  if [ -d $(WORSRCLINKUP)/$$component ]; then \
+	    $(LN_S) -f $(WORSRCLINKUP)/$$component ./;\
+	  fi; \
+        done; \
 
 internal-wobundle-all_:: $(GNUSTEP_OBJ_DIR) \
                           build-bundle-dir \