rendered paste bodyIndex: i18n/translate.pro
===================================================================
--- i18n/translate.pro (revision 8854)
+++ i18n/translate.pro (working copy)
@@ -1,3 +1,10 @@
+include ( ../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
SOURCES += ../libs/libmyth/dbsettings.cpp
SOURCES += ../libs/libmyth/langsettings.cpp
SOURCES += ../libs/libmyth/managedlist.cpp
Index: i18n/i18n.pro
===================================================================
--- i18n/i18n.pro (revision 8854)
+++ i18n/i18n.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../settings.pro )
TEMPLATE = app
Index: configure
===================================================================
--- configure (revision 8854)
+++ configure (working copy)
@@ -574,6 +574,7 @@
source_path=`pwd`
source_path_used="no"
else
+ build_path="`pwd`"
source_path="`cd \"$source_path\"; pwd`"
fi
@@ -2223,6 +2224,22 @@
MYTH_CONFIG_H=libs/libmyth/mythconfig.h
MYTH_CONFIG_MAK=libs/libmyth/mythconfig.mak
+
+# build tree in object directory if source path is different from current one
+if test "$source_path_used" = "yes" ; then
+
+ FILES=`cd $source_path;find -iname \*.pro |sed -e "s/^.\///"`
+ DIRS=`echo $FILES |xargs -n 1 |sed -e "s/\/*[^\/]*$//;/^$/D" |sort -u`
+ for dir in $DIRS ; do
+ mkdir -p $dir
+ ln -sf "$source_path/$dir" $dir/sourcedir
+ done
+ for f in $FILES ; do
+ ln -sf "$source_path/$f" $f
+ done
+fi
+
+
echo "Creating $MYTH_CONFIG_H and $MYTH_CONFIG_MAK"
date >> config.log
@@ -2231,6 +2248,8 @@
echo "/* Automatically generated by configure - do not modify */" > $TMPH
echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
+echo "SRC_PATH='$source_path'" >> $MYTH_CONFIG_MAK
+echo "BUILD_PATH='$build_path'" >> $MYTH_CONFIG_MAK
echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK
#echo "libdir=$libdir" >> $MYTH_CONFIG_MAK
#echo "bindir=$bindir" >> $MYTH_CONFIG_MAK
@@ -2697,20 +2716,6 @@
echo "#define always_inline" >> $TMPH
fi
-# build tree in object directory if source path is different from current one
-if test "$source_path_used" = "yes" ; then
- DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \
- libavcodec/ppc libavcodec/liba52 libavcodec/mlib libavcodec/libpostproc tests vhook"
- FILES="Makefile libavformat/Makefile libavcodec/Makefile libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile"
- for dir in $DIRS ; do
- mkdir -p $dir
- done
- for f in $FILES ; do
- ln -sf "$source_path/$f" $f
- done
-fi
-echo "SRC_PATH='$source_path'" >> $MYTH_CONFIG_MAK
-
if test "$amr_wb" = "yes" ; then
echo "#define AMR_WB 1" >> $TMPH
echo "AMR_WB=yes" >> $MYTH_CONFIG_MAK
Index: version.pro
===================================================================
--- version.pro (revision 8854)
+++ version.pro (working copy)
@@ -5,7 +5,7 @@
# "exported" is reported as the revision. #
############################################################
-SVNTREEDIR = $$system(pwd)
+SVNTREEDIR = $${CURRENT_SOURCE_DIR}
SOURCES += version.cpp
Index: themes/themes.pro
===================================================================
--- themes/themes.pro (revision 8854)
+++ themes/themes.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../settings.pro )
QMAKE_STRIP = echo
Index: libs/libmythtv/libmythtv.pro
===================================================================
--- libs/libmythtv/libmythtv.pro (revision 8854)
+++ libs/libmythtv/libmythtv.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,9 +12,9 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH += ../.. ..
-INCLUDEPATH += ../libmyth ../libavcodec ../libavutil ../libmythmpeg2
-INCLUDEPATH += ./dvbdev ./mpeg
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../.. $${CURRENT_SOURCE_DIR}/.. $${CURRENT_SOURCE_DIR}
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../libmyth $${CURRENT_SOURCE_DIR}/../libavcodec $${CURRENT_SOURCE_DIR}/../libavutil $${CURRENT_SOURCE_DIR}/../libmythmpeg2
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/dvbdev $${CURRENT_SOURCE_DIR}/mpeg
DEPENDPATH += ../libmyth ../libavcodec ../libavformat ../libavutil
DEPENDPATH += ../libmythmpeg2
DEPENDPATH += ./dvbdev ./mpeg
@@ -58,7 +63,7 @@
# old libvbitext (Caption decoder)
!win32 {
- HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
+ HEADERS += vbilut.h vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
HEADERS += vbitext/vbi.h vbitext/vt.h
SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
}
Index: libs/libmythmpeg2/libmythmpeg2.pro
===================================================================
--- libs/libmythmpeg2/libmythmpeg2.pro (revision 8854)
+++ libs/libmythmpeg2/libmythmpeg2.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -22,7 +27,7 @@
inc.path = $${PREFIX}/include/mythtv/mpeg2dec/
inc.files = mpeg2.h
-INCLUDEPATH += ../../libs/libavcodec
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavcodec
INSTALLS += inc
Index: libs/libmythsoundtouch/libmythsoundtouch.pro
===================================================================
--- libs/libmythsoundtouch/libmythsoundtouch.pro (revision 8854)
+++ libs/libmythsoundtouch/libmythsoundtouch.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,7 +12,7 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH += ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
QMAKE_CXXFLAGS_RELEASE += -fPIC -DPIC
QMAKE_CXXFLAGS_DEBUG += -fPIC -DPIC
Index: libs/libavformat/libavformat.pro
===================================================================
--- libs/libavformat/libavformat.pro (revision 8854)
+++ libs/libavformat/libavformat.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,7 +12,7 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../ $${CURRENT_SOURCE_DIR}/../../ $${CURRENT_SOURCE_DIR}/../libavcodec $${CURRENT_SOURCE_DIR}/../libavutil $${CURRENT_SOURCE_DIR}/../libmythtv
DEFINES += HAVE_AV_CONFIG_H _LARGEFILE_SOURCE
Index: libs/libmythsamplerate/libmythsamplerate.pro
===================================================================
--- libs/libmythsamplerate/libmythsamplerate.pro (revision 8854)
+++ libs/libmythsamplerate/libmythsamplerate.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,7 +12,7 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH += ../../
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../
QMAKE_CFLAGS_RELEASE = $$OPTFLAGS -DHAVE_AV_CONFIG_H -I.. -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
QMAKE_CFLAGS_DEBUG = -g -DHAVE_AV_CONFIG_H -I.. -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
Index: libs/libmythui/libmythui.pro
===================================================================
--- libs/libmythui/libmythui.pro (revision 8854)
+++ libs/libmythui/libmythui.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,8 +12,8 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH += ../libmyth
-INCLUDEPATH += ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../libmyth
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../..
DEPENDPATH += ../libmyth .
@@ -42,6 +47,10 @@
#
# Configuration dependent stuff (depending on what is set in mythtv top
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_BUILD_DIR=$$system(pwd)
+}
# level settings.pro)
#
Index: libs/libmyth/libmyth.pro
===================================================================
--- libs/libmyth/libmyth.pro (revision 8854)
+++ libs/libmyth/libmyth.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -33,7 +38,7 @@
SOURCES += DisplayResScreen.cpp util-x11.cpp qmdcodec.cpp
SOURCES += virtualkeyboard.cpp mythobservable.cpp
-INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../libmythsamplerate $${CURRENT_SOURCE_DIR}/../libmythsoundtouch ../..
DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
Index: libs/libavcodec/libavcodec.pro
===================================================================
--- libs/libavcodec/libavcodec.pro (revision 8854)
+++ libs/libavcodec/libavcodec.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -7,7 +12,7 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH = ../ ../../ ../libavutil
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../ $${CURRENT_SOURCE_DIR}/../../ $${CURRENT_SOURCE_DIR}/../libavutil
DEFINES += HAVE_AV_CONFIG_H _LARGEFILE_SOURCE
Index: libs/libavutil/libavutil.pro
===================================================================
--- libs/libavutil/libavutil.pro (revision 8854)
+++ libs/libavutil/libavutil.pro (working copy)
@@ -1,4 +1,10 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+ INCLUDEPATH += $$SRC_PATH
+}
include ( ../../settings.pro )
TEMPLATE = lib
@@ -8,7 +14,7 @@
target.path = $${PREFIX}/lib
INSTALLS = target
-INCLUDEPATH = ../ ../../
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../ $${CURRENT_SOURCE_DIR}/../../
DEFINES += HAVE_AV_CONFIG_H _LARGEFILE_SOURCE
Index: programs/mythuitest/mythuitest.pro
===================================================================
--- programs/mythuitest/mythuitest.pro (revision 8854)
+++ programs/mythuitest/mythuitest.pro (working copy)
@@ -1,14 +1,18 @@
-INCLUDEPATH += ../../libs/libmythui ../../libs/libmyth
-
-LIBS += -L../../libs/libmyth -L../../libs/libmythui
-
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = app
TARGET = mythuitest
CONFIG += thread opengl
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythui $${CURRENT_SOURCE_DIR}/../../libs/libmyth
+
+LIBS += -L../../libs/libmyth -L../../libs/libmythui
LIBS += -lmythui-$$LIBVERSION -lmyth-$$LIBVERSION $$EXTRA_LIBS
isEmpty(QMAKE_EXTENSION_SHLIB) {
Index: programs/programs-libs.pro
===================================================================
--- programs/programs-libs.pro (revision 8854)
+++ programs/programs-libs.pro (working copy)
@@ -1,5 +1,7 @@
-INCLUDEPATH += ../../libs/ ../../libs/libmyth ../../libs/libmythtv ../..
-INCLUDEPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libavcodec
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/ $${CURRENT_SOURCE_DIR}/../../libs/libmyth
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavutil $${CURRENT_SOURCE_DIR}/../../libs/libavformat
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavcodec
LIBS += -L../../libs/libmyth -L../../libs/libmythtv
LIBS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
Index: programs/mythfrontend/mythfrontend.pro
===================================================================
--- programs/mythfrontend/mythfrontend.pro (revision 8854)
+++ programs/mythfrontend/mythfrontend.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
include ( ../../version.pro )
include ( ../programs-libs.pro )
Index: programs/mythjobqueue/mythjobqueue.pro
===================================================================
--- programs/mythjobqueue/mythjobqueue.pro (revision 8854)
+++ programs/mythjobqueue/mythjobqueue.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro)
include ( ../programs-libs.pro)
Index: programs/mythtvosd/mythtvosd.pro
===================================================================
--- programs/mythtvosd/mythtvosd.pro (revision 8854)
+++ programs/mythtvosd/mythtvosd.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
TEMPLATE = app
@@ -8,7 +13,7 @@
INSTALLS = target
LIBS += $$EXTRA_LIBS
-INCLUDEPATH += ../../libs/libmyth
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmyth
QMAKE_CLEAN += $(TARGET)
Index: programs/mythtranscode/mythtranscode.pro
===================================================================
--- programs/mythtranscode/mythtranscode.pro (revision 8854)
+++ programs/mythtranscode/mythtranscode.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro)
include ( ../programs-libs.pro)
@@ -17,6 +22,6 @@
HEADERS += replex/element.h replex/mpg_common.h replex/multiplex.h \
replex/pes.h replex/ringbuffer.h
-INCLUDEPATH += replex
-INCLUDEPATH += ../../libs/libavcodec ../../libs/libavformat \
- ../../libs/libavutil ../../libs/libmythmpeg2
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/replex
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../../libs/libavformat \
+ $${CURRENT_SOURCE_DIR}/../../libs/libavutil $${CURRENT_SOURCE_DIR}/../../libs/libmythmpeg2
Index: programs/mythcommflag/mythcommflag.pro
===================================================================
--- programs/mythcommflag/mythcommflag.pro (revision 8854)
+++ programs/mythcommflag/mythcommflag.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include (../../settings.pro)
include ( ../programs-libs.pro )
Index: programs/mythbackend/mythbackend.pro
===================================================================
--- programs/mythbackend/mythbackend.pro (revision 8854)
+++ programs/mythbackend/mythbackend.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
include ( ../../version.pro )
include ( ../programs-libs.pro )
Index: programs/programs.pro
===================================================================
--- programs/programs.pro (revision 8854)
+++ programs/programs.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../settings.pro )
TEMPLATE = subdirs
Index: programs/mythlcdserver/mythlcdserver.pro
===================================================================
--- programs/mythlcdserver/mythlcdserver.pro (revision 8854)
+++ programs/mythlcdserver/mythlcdserver.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
include ( ../programs-libs.pro )
Index: programs/mythtv/mythtv.pro
===================================================================
--- programs/mythtv/mythtv.pro (revision 8854)
+++ programs/mythtv/mythtv.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
include ( ../programs-libs.pro )
Index: programs/mythfilldatabase/mythfilldatabase.pro
===================================================================
--- programs/mythfilldatabase/mythfilldatabase.pro (revision 8854)
+++ programs/mythfilldatabase/mythfilldatabase.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../../settings.pro )
include ( ../programs-libs.pro )
Index: programs/mythshutdown/mythshutdown.pro
===================================================================
--- programs/mythshutdown/mythshutdown.pro (revision 8854)
+++ programs/mythshutdown/mythshutdown.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include (../../settings.pro)
include (../programs-libs.pro)
Index: programs/mythwelcome/mythwelcome.pro
===================================================================
--- programs/mythwelcome/mythwelcome.pro (revision 8854)
+++ programs/mythwelcome/mythwelcome.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include (../../settings.pro)
include (../programs-libs.pro)
Index: settings.pro
===================================================================
--- settings.pro (revision 8854)
+++ settings.pro (working copy)
@@ -18,6 +18,10 @@
}
}
+!contains ( BUILD_PATH, '' ) {
+ INCLUDEPATH += $$SRC_PATH
+}
+
INCLUDEPATH += $${PREFIX}/include
INCLUDEPATH += $$CONFIG_INCLUDEPATH
Index: setup/setup.pro
===================================================================
--- setup/setup.pro (revision 8854)
+++ setup/setup.pro (working copy)
@@ -1,4 +1,9 @@
include ( ../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
include ( ../settings.pro )
TEMPLATE = app
@@ -6,7 +11,7 @@
TARGET = mythtv-setup
target.path = $${PREFIX}/bin
-INCLUDEPATH += ../libs/libmythtv ../libs ../libs/libmyth
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../libs/libmythtv $${CURRENT_SOURCE_DIR}/../libs $${CURRENT_SOURCE_DIR}/../libs/libmyth
LIBS += -L../libs/libmyth -L../libs/libmythtv -L../libs/libavcodec
LIBS += -L../libs/libavformat -L../libs/libavutil
Index: filters/linearblend/linearblend.pro
===================================================================
--- filters/linearblend/linearblend.pro (revision 8854)
+++ filters/linearblend/linearblend.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_linearblend.c
Index: filters/quickdnr/quickdnr.pro
===================================================================
--- filters/quickdnr/quickdnr.pro (revision 8854)
+++ filters/quickdnr/quickdnr.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_quickdnr.c
Index: filters/convert/convert.pro
===================================================================
--- filters/convert/convert.pro (revision 8854)
+++ filters/convert/convert.pro (working copy)
@@ -1,6 +1,13 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
# Input
SOURCES += filter_convert.c
Index: filters/postprocess/postprocess.pro
===================================================================
--- filters/postprocess/postprocess.pro (revision 8854)
+++ filters/postprocess/postprocess.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
DEPENDPATH += ../../libs/libmythtv
SOURCES += filter_postprocess.c
Index: filters/onefield/onefield.pro
===================================================================
--- filters/onefield/onefield.pro (revision 8854)
+++ filters/onefield/onefield.pro (working copy)
@@ -1,6 +1,13 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
# Input
SOURCES += filter_onefield.c
Index: filters/filter-avcodec.pro
===================================================================
--- filters/filter-avcodec.pro (revision 8854)
+++ filters/filter-avcodec.pro (working copy)
@@ -3,7 +3,7 @@
# This eliminates a linker warning
CONFIG += qt
-INCLUDEPATH += ../../libs/libavcodec ../../libs/libavutil
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../../libs/libavutil
DEPENDPATH += ../../libs/libavcodec ../../libs/libavutil
LIBS += -L../../libs/libavutil -lmythavutil-$${LIBVERSION}
Index: filters/bobdeint/bobdeint.pro
===================================================================
--- filters/bobdeint/bobdeint.pro (revision 8854)
+++ filters/bobdeint/bobdeint.pro (working copy)
@@ -1,6 +1,13 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
# Input
SOURCES += filter_bobdeint.c
Index: filters/adjust/adjust.pro
===================================================================
--- filters/adjust/adjust.pro (revision 8854)
+++ filters/adjust/adjust.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_adjust.c
Index: filters/force/force.pro
===================================================================
--- filters/force/force.pro (revision 8854)
+++ filters/force/force.pro (working copy)
@@ -1,6 +1,13 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
# Input
SOURCES += filter_force.c
Index: filters/crop/crop.pro
===================================================================
--- filters/crop/crop.pro (revision 8854)
+++ filters/crop/crop.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_crop.c
Index: filters/kerneldeint/kerneldeint.pro
===================================================================
--- filters/kerneldeint/kerneldeint.pro (revision 8854)
+++ filters/kerneldeint/kerneldeint.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_kerneldeint.c
Index: filters/invert/invert.pro
===================================================================
--- filters/invert/invert.pro (revision 8854)
+++ filters/invert/invert.pro (working copy)
@@ -1,6 +1,13 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
-INCLUDEPATH += ../../libs/libmythtv
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv
# Input
SOURCES += filter_invert.c
Index: filters/denoise3d/denoise3d.pro
===================================================================
--- filters/denoise3d/denoise3d.pro (revision 8854)
+++ filters/denoise3d/denoise3d.pro (working copy)
@@ -1,7 +1,14 @@
+include ( ../../config.mak )
+CURRENT_SOURCE_DIR=.
+!isEmpty ( SRC_PATH ) {
+ CURRENT_SOURCE_DIR=$$system( readlink sourcedir )
+ VPATH=$$CURRENT_SOURCE_DIR
+}
+
include ( ../filter-common.pro )
include ( ../filter-avcodec.pro )
-INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
+INCLUDEPATH += $${CURRENT_SOURCE_DIR}/../../libs/libmythtv $${CURRENT_SOURCE_DIR}/../../libs/libavcodec $${CURRENT_SOURCE_DIR}/../..
# Input
SOURCES += filter_denoise3d.c