From 22883beb82bea04a0da0508bde98e0abc0a25a09 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Sun, 9 Jun 2013 22:46:01 +1000 Subject: [PATCH] Simplify rpath configuration settings. Using a global variable instead, set to the proper value according to the system used to compile --- .../test/test_mythsystem/test_mythsystem.pro | 19 +++++-------------- .../test_mythsystemlegacy.pro | 19 +++++-------------- .../test/test_mythtimer/test_mythtimer.pro | 17 ++++------------- .../test/test_template/test_template.pro | 17 ++++------------- 4 files changed, 18 insertions(+), 54 deletions(-) diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro index fd6fdb291b6..659272a85d8 100644 --- a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro +++ b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro @@ -14,26 +14,17 @@ TARGET = test_mythsystem DEPENDPATH += . ../.. ../../logging INCLUDEPATH += . ../.. ../../logging LIBS += -L../.. -lmythbase-$$LIBVERSION -LIBS += -Wl,-rpath,$${PWD}/../.. +LIBS += -Wl,$$_RPATH_$${PWD}/../.. contains(QMAKE_CXX, "g++") { QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage QMAKE_LFLAGS += -fprofile-arcs } -macx { -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../.. -} - -linux | freebsd { -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../.. -} +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/zeromq/src/.libs/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/nzmqt/src/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/qjson/lib/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../.. # Input HEADERS += test_mythsystem.h diff --git a/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro b/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro index e4fd735f212..2baf723646d 100644 --- a/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro +++ b/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro @@ -14,26 +14,17 @@ TARGET = test_mythsystemlegacy DEPENDPATH += . ../.. ../../logging INCLUDEPATH += . ../.. ../../logging LIBS += -L../.. -lmythbase-$$LIBVERSION -LIBS += -Wl,-rpath,$${PWD}/../.. +LIBS += -Wl,$$_RPATH_$${PWD}/../.. contains(QMAKE_CXX, "g++") { QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage QMAKE_LFLAGS += -fprofile-arcs } -macx { -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../.. -} - -linux | freebsd { -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../.. -} +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/zeromq/src/.libs/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/nzmqt/src/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/qjson/lib/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../.. # Input HEADERS += test_mythsystemlegacy.h diff --git a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro index 230e3f35341..dd8c40b319c 100644 --- a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro +++ b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro @@ -17,19 +17,10 @@ contains(QMAKE_CXX, "g++") { QMAKE_LFLAGS += -fprofile-arcs } -macx { -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../.. -} - -linux | freebsd { -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../.. -} +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/zeromq/src/.libs/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/nzmqt/src/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/qjson/lib/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../.. # Input HEADERS += test_mythtimer.h diff --git a/mythtv/libs/libmythbase/test/test_template/test_template.pro b/mythtv/libs/libmythbase/test/test_template/test_template.pro index b18000f2fd1..e0aaf631f8a 100644 --- a/mythtv/libs/libmythbase/test/test_template/test_template.pro +++ b/mythtv/libs/libmythbase/test/test_template/test_template.pro @@ -20,19 +20,10 @@ contains(QMAKE_CXX, "g++") { QMAKE_LFLAGS += -fprofile-arcs } -macx { -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../.. -} - -linux | freebsd { -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/ -QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../.. -} +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/zeromq/src/.libs/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/nzmqt/src/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/qjson/lib/ +QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../.. # Input HEADERS += test_template.h