From 68d79472a529b783273bf766bf4d5e5eb029343d Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 2 Oct 2014 10:46:47 -0400 Subject: [PATCH] Fixed makefile for teststrings due to sogo lib change --- Tests/Integration/GNUmakefile | 1 + Tests/Integration/GNUmakefile.preamble | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/Integration/GNUmakefile b/Tests/Integration/GNUmakefile index c93ca1c10..5347e57aa 100644 --- a/Tests/Integration/GNUmakefile +++ b/Tests/Integration/GNUmakefile @@ -1,3 +1,4 @@ +include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = teststrings diff --git a/Tests/Integration/GNUmakefile.preamble b/Tests/Integration/GNUmakefile.preamble index 7237a3cd8..67eb61e04 100644 --- a/Tests/Integration/GNUmakefile.preamble +++ b/Tests/Integration/GNUmakefile.preamble @@ -10,9 +10,10 @@ ADDITIONAL_INCLUDE_DIRS += \ -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ ADDITIONAL_LIB_DIRS += \ - -L../../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \ + -L../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -lSOGo \ -L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \ -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \ - -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions + -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions \ + -Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj ADDITIONAL_LDFLAGS += -Wl,--no-as-needed