adun.app (0.81-5) 15_link-properly.patch

Summary

 Kernel/AdunKernel/GNUmakefile      |    2 +-
 Kernel/Base/GNUmakefile.preamble   |    3 ++-
 Kernel/GNUmakefile                 |    2 +-
 MolTalk/GNUmakefile.preamble       |    2 +-
 UL/AdunServer/GNUmakefile          |    2 +-
 UL/AdunServer/GNUmakefile.preamble |    4 +---
 UL/GNUmakefile                     |    2 +-
 UL/ULFramework/GNUmakefile         |    2 +-
 UL/XMLLib/GNUmakefile.preamble     |    3 ++-
 9 files changed, 11 insertions(+), 11 deletions(-)

    
download this patch

Patch contents

Name: 15_build.patch
Author: Yavor Doganov <yavor@gnu.org>
Forwarded: not yet

--- Adun-0.81.orig/Kernel/AdunKernel/GNUmakefile
+++ Adun-0.81/Kernel/AdunKernel/GNUmakefile
@@ -10,7 +10,7 @@
 VERSION = 0.13
 FRAMEWORK_NAME =AdunKernel 
 AdunKernel_LIB_DIRS = -L../Base/$(GNUSTEP_OBJ_DIR) -L$(GSL_LIB_DIR) 
-AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgnustep-base -lgsl -lgslcblas
+AdunKernel_LIBRARIES_DEPEND_UPON = -ladun_base -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
 endif
 
 export KERNEL_COMPILER ?= gcc
--- Adun-0.81.orig/Kernel/GNUmakefile
+++ Adun-0.81/Kernel/GNUmakefile
@@ -22,7 +22,7 @@
 ifeq ($(ADUN_LIBRARY_COMPILER), icc)
 	AdunCore_TOOL_LIBS =   -lAdunKernel -ladun_base -lgsl -lgslcblas -lfl -limf -lsvml -lm -ladun_base 
 else
-	AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base  -lgsl -lgslcblas 
+	AdunCore_TOOL_LIBS = -lAdunKernel -ladun_base
 endif
 
 GNUSTEP_INSTALLATION_DOMAIN=USER
--- Adun-0.81.orig/MolTalk/GNUmakefile.preamble
+++ Adun-0.81/MolTalk/GNUmakefile.preamble
@@ -63,7 +63,7 @@
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
 endif
-LIBRARIES_DEPEND_UPON +=
+LIBRARIES_DEPEND_UPON += -lm $(FND_LIBS) $(OBJC_LIBS)
 
 #
 # Flags dealing with installing and uninstalling
--- Adun-0.81.orig/UL/AdunServer/GNUmakefile
+++ Adun-0.81/UL/AdunServer/GNUmakefile
@@ -18,7 +18,7 @@
 #
 
 AdunServer_LIB_DIRS +=  -L../ULFramework/ULFramework.framework/Versions/Current -L../XMLLib/obj  
-AdunServer_TOOL_LIBS +=  -lXMLLib -lULFramework
+AdunServer_TOOL_LIBS +=  -lXMLLib -lULFramework -ladun_base -lAdunKernel -lMolTalk
 
 #
 # Resource files
--- Adun-0.81.orig/UL/AdunServer/GNUmakefile.preamble
+++ Adun-0.81/UL/AdunServer/GNUmakefile.preamble
@@ -15,9 +15,7 @@
 ADDITIONAL_CFLAGS += 
 
 # Additional flags to pass to the linker
-ifeq ($(MAKELEVEL), 3)
-ADDITIONAL_LDFLAGS += -ladun_base -lAdunKernel -lMolTalk 
-endif
+ADDITIONAL_LDFLAGS +=  
 
 # Additional include directories the compiler should search
 ifeq ($(MAKELEVEL),3)
--- Adun-0.81.orig/UL/GNUmakefile
+++ Adun-0.81/UL/GNUmakefile
@@ -25,7 +25,7 @@
 
 UL_LIB_DIRS += -L./XMLLib/obj -L. -L./ULFramework/ULFramework.framework/Versions/Current
 UL_HEADER_FILES_INSTALL_DIR = UL/
-UL_OBJC_LIBS =  -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base  -lgsl -lgslcblas
+UL_GUI_LIBS =  -lXMLLib -lULFramework -lAdunKernel -lMolTalk -ladun_base
 
 GNUSTEP_INSTALLATION_DOMAIN = USER
 #
--- Adun-0.81.orig/UL/ULFramework/GNUmakefile
+++ Adun-0.81/UL/ULFramework/GNUmakefile
@@ -14,7 +14,7 @@
 #
 # Libraries
 #
-ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib
+ULFramework_LIBRARIES_DEPEND_UPON += -lAdunKernel -lMolTalk -lXMLLib -lgsl -lgslcblas -lm $(FND_LIBS) $(OBJC_LIBS)
 
 ifeq ($(MAKELEVEL),3)
 ULFramework_LIB_DIRS =  -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current -L$(ADUN_SOURCE_DIR)/MolTalk/MolTalk.framework/Versions/Current 
--- Adun-0.81.orig/UL/XMLLib/GNUmakefile.preamble
+++ Adun-0.81/UL/XMLLib/GNUmakefile.preamble
@@ -18,5 +18,6 @@
 ADDITIONAL_INCLUDE_DIRS += -I../ -I../../Kernel -I../../Kernel/AdunKernel/Headers
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS += 
+ADDITIONAL_LIB_DIRS += -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
 
+LIBRARIES_DEPEND_UPON += -lAdunKernel $(FND_LIBS) $(OBJC_LIBS)
--- Adun-0.81.orig/Kernel/Base/GNUmakefile.preamble
+++ Adun-0.81/Kernel/Base/GNUmakefile.preamble
@@ -17,7 +17,8 @@
 ADDITIONAL_CFLAGS += 
 
 # Additional flags to pass to the linker
-ADDITIONAL_LDFLAGS +=  -lgsl -lgslcblas
+ADDITIONAL_LDFLAGS +=
+LIBRARIES_DEPEND_UPON += -lgsl -lm
 
 # Additional include directories the compiler should search
 ADDITIONAL_INCLUDE_DIRS += -I$(GSL_INCLUDE_DIR)