Ticket #1295: mythseperatebuild6.diff

File mythseperatebuild6.diff, 38.2 KB (added by Dibblah, 6 years ago)

Fixes previous bug with svnversion and themes not being installed

  • i18n/i18n.pro

     
    11include ( ../config.mak ) 
    22include ( ../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = app 
    59CONFIG -= moc qt 
    610 
  • configure

     
    841841  esac 
    842842 
    843843# find source path 
    844 source_path="`dirname $0`" 
     844if test -h $0; then 
     845    source_path="`readlink $0`" 
     846    source_path="`dirname $source_path`" 
     847else 
     848    source_path="`dirname $0`" 
     849fi 
     850 
     851source_path="`cd \"$source_path\"; pwd`" 
    845852source_path_used="yes" 
    846 if test -z "$source_path" -o "$source_path" = "." ; then 
     853if test -z "$source_path" -o "$source_path" = "`pwd`"; then 
    847854    source_path=`pwd` 
    848855    source_path_used="no" 
    849856else 
     857    build_path="`pwd`" 
    850858    source_path="`cd \"$source_path\"; pwd`" 
     859    CONFIG_INCLUDEPATH="$CONFIG_INCLUDEPATH $build_path" 
    851860fi 
    852861 
    853862FFMPEG_CONFIGURATION=" " 
     
    25102519echo "Compiler cache   $ccache" 
    25112520echo "DistCC           $distcc" 
    25122521echo "Install prefix   $prefix" 
    2513 #echo "Source path      $source_path" 
     2522if test "$source_path_used" = "yes"; then 
     2523    echo "Source path      $source_path" 
     2524fi 
    25142525#echo "C compiler       $cc" 
    25152526#echo "make             $make" 
    25162527if test x"$processor" != x"" ; then 
     
    26482659 
    26492660MYTH_CONFIG_H=libs/libmyth/mythconfig.h 
    26502661MYTH_CONFIG_MAK=libs/libmyth/mythconfig.mak 
     2662 
     2663# build tree in object directory if source path is different from current one 
     2664if test "$source_path_used" = "yes" ; then 
     2665 
     2666    ln -snf "$source_path/configure" configure 
     2667    FILES=`cd $source_path;find -iname \*.pro -or -iname \*.h -or -iname \*.hh |sed -e "s/^.\///"` 
     2668    DIRS=`echo $FILES |xargs -n 1 |sed -e "s/\/*[^\/]*$//;/^$/D" |sort -u` 
     2669    THEMEDIRS=`cd $source_path;find themes/ -maxdepth 1 -mindepth 1 -type d |sed -e "s/^.\///;/\.svn/d"` 
     2670 
     2671    for dir in $DIRS ; do 
     2672            mkdir -p $dir 
     2673            ln -snf "$source_path/$dir" $dir/sourcedir 
     2674    done 
     2675     
     2676    for f in $FILES $THEMEDIRS ; do 
     2677        ln -snf "$source_path/$f" $f 
     2678    done 
     2679fi 
     2680 
     2681 
    26512682echo "Creating $MYTH_CONFIG_H and $MYTH_CONFIG_MAK" 
    26522683 
    26532684date >> config.log 
     
    26562687echo "/* Automatically generated by configure - do not modify */" > $TMPH 
    26572688echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH 
    26582689 
     2690echo "SRC_PATH=$source_path" >> $MYTH_CONFIG_MAK 
     2691echo "BUILD_PATH=$build_path" >> $MYTH_CONFIG_MAK 
    26592692echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK 
    26602693echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK 
    26612694#echo "bindir=$bindir" >> $MYTH_CONFIG_MAK 
     
    31853218  echo "#define CONFIG_SMALL 1" >> $TMPH 
    31863219fi 
    31873220 
    3188 # build tree in object directory if source path is different from current one 
    3189 if test "$source_path_used" = "yes" ; then 
    3190     DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \ 
    3191           libavcodec/ppc libavcodec/liba52 libavcodec/mlib libavcodec/libpostproc tests vhook" 
    3192     FILES="Makefile libavformat/Makefile libavcodec/Makefile libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile" 
    3193     for dir in $DIRS ; do 
    3194             mkdir -p $dir 
    3195     done 
    3196     for f in $FILES ; do 
    3197         ln -sf "$source_path/$f" $f 
    3198     done 
    3199 fi 
    3200 echo "SRC_PATH='$source_path'" >> $MYTH_CONFIG_MAK 
    3201  
    32023221if test "$amr_wb" = "yes" ; then 
    32033222  echo "#define CONFIG_AMR_WB 1" >> $TMPH 
    32043223  echo "CONFIG_AMR_WB=yes" >> $MYTH_CONFIG_MAK 
  • version.pro

     
    55#        "exported" is reported as the revision.           # 
    66############################################################ 
    77 
    8 SVNTREEDIR = $$system(pwd) 
     8include ( config.mak ) 
     9include ( settings.pro ) 
    910 
     11exists (libs/sourcedir) { 
     12    SVNTREEDIR = $$SRC_PATH 
     13} else { 
     14    SVNTREEDIR = $$system(pwd) 
     15} 
     16 
     17 
    1018SOURCES += version.cpp 
    1119 
     20INCLUDEPATH += libs/libmyth $$BUILD_PATH 
    1221version.target = version.cpp  
    1322version.commands = echo 'const char *myth_source_version =' \ 
    1423'"'`(svnversion $${SVNTREEDIR} 2>/dev/null) || echo Unknown`'";' > .vers.new ; \ 
  • themes/themes.pro

     
    11include ( ../config.mak ) 
    22include ( ../settings.pro ) 
    33 
     4exists (sourcedir) { 
     5   VPATH=./sourcedir 
     6   !macx:QMAKE_COPY_DIR = sh ./sourcedir/cpsvndir 
     7} else { 
     8   !macx:QMAKE_COPY_DIR = sh ./cpsvndir 
     9} 
     10 
    411QMAKE_STRIP = echo 
    512 
    613TEMPLATE = app 
    714CONFIG -= moc qt 
    815 
    9 !macx:QMAKE_COPY_DIR = sh ./cpsvndir 
    1016 
    1117themes.path = $${PREFIX}/share/mythtv/themes/ 
    1218themes.files = blue defaultosd blueosd oldosd default default-wide G.A.N.T. classic DVR 
  • libs/libmythtv/dvbrecorder.cpp

     
    6666#include "dvbrecorder.h" 
    6767 
    6868// AVLib/FFMPEG includes 
    69 #include "../libavcodec/avcodec.h" 
    70 #include "../libavformat/avformat.h" 
    71 #include "../libavformat/mpegts.h" 
     69#include "avcodec.h" 
     70#include "avformat.h" 
     71#include "mpegts.h" 
    7272 
    7373const int DVBRecorder::TSPACKETS_BETWEEN_PSIP_SYNC = 2000; 
    7474const int DVBRecorder::POLL_INTERVAL        =  50; // msec 
  • libs/libmythtv/nuppeldecoder.cpp

     
    1212using namespace std; 
    1313 
    1414// MythTV headers 
    15 #include "mythconfig.h" 
     15#include "config.h" 
    1616#include "nuppeldecoder.h" 
    1717#include "NuppelVideoPlayer.h" 
    1818#include "remoteencoder.h" 
  • libs/libmythtv/NuppelVideoRecorder.cpp

     
    44#include <unistd.h> 
    55#include <sys/types.h> 
    66#include <sys/stat.h> 
    7 #include "mythconfig.h" 
     7#include "config.h" 
    88#ifdef HAVE_SYS_SOUNDCARD_H 
    99    #include <sys/soundcard.h> 
    1010#elif HAVE_SOUNDCARD_H 
  • libs/libmythtv/hdtvrecorder.cpp

     
    8686#include "tv_rec.h" 
    8787 
    8888// AVLib/FFMPEG includes 
    89 #include "../libavcodec/avcodec.h" 
    90 #include "../libavformat/avformat.h" 
    91 #include "../libavformat/mpegts.h" 
     89#include "avcodec.h" 
     90#include "avformat.h" 
     91#include "mpegts.h" 
    9292 
    9393#define REPORT_RING_STATS 1 
    9494 
  • libs/libmythtv/videoout_quartz.cpp

     
    5959 
    6060#include "osd.h" 
    6161#include "osdsurface.h" 
    62 #include "mythconfig.h" 
     62#include "config.h" 
    6363#ifdef CONFIG_MAC_ACCEL 
    6464#include "videoout_accel_utils.h" 
    6565#endif 
  • libs/libmythtv/avformatdecoder.cpp

     
    88using namespace std; 
    99 
    1010// MythTV headers 
    11 #include "mythconfig.h" // for CONFIG_DTS 
     11#include "config.h" // for CONFIG_DTS 
    1212#include "avformatdecoder.h" 
    1313#include "RingBuffer.h" 
    1414#include "NuppelVideoPlayer.h" 
     
    3434 
    3535extern "C" { 
    3636#include "libavcodec/liba52/a52.h" 
    37 #include "../libmythmpeg2/mpeg2.h" 
     37#include "mpeg2.h" 
    3838#include "ivtv_myth.h" 
    3939} 
    4040 
  • libs/libmythtv/libmythtv.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythtv-$$LIBVERSION 
    610CONFIG += thread dll 
     
    812INSTALLS = target 
    913 
    1014INCLUDEPATH += ../.. .. 
    11 INCLUDEPATH += ../libmyth ../libavcodec ../libavutil ../libmythmpeg2 
    12 INCLUDEPATH += ./dvbdev ./mpeg 
     15INCLUDEPATH += ../libmyth ../libavcodec ../libavutil ../libavformat 
     16INCLUDEPATH += ../libmythmpeg2 ./dvbdev ./mpeg 
    1317INCLUDEPATH += ../libmythlivemedia/BasicUsageEnvironment/include 
    1418INCLUDEPATH += ../libmythlivemedia/groupsock/include 
    1519INCLUDEPATH += ../libmythlivemedia/liveMedia/include 
  • libs/libmythtv/nuppeldecoder.h

     
    2121 
    2222extern "C" { 
    2323#include "frame.h" 
    24 #include "../libavcodec/avcodec.h" 
     24#include "avcodec.h" 
    2525} 
    2626 
    2727class RawDataList 
  • libs/libmythtv/ivtvdecoder.h

     
    1010 
    1111extern "C" { 
    1212#include "frame.h" 
    13 #include "../libavcodec/avcodec.h" 
     13#include "avcodec.h" 
    1414#include "../libavformat/avformat.h" 
    1515} 
    1616 
  • libs/libmythtv/NuppelVideoRecorder.h

     
    1717#include "filter.h" 
    1818#include "minilzo.h" 
    1919#undef HAVE_AV_CONFIG_H 
    20 #include "../libavcodec/avcodec.h" 
     20#include "avcodec.h" 
    2121 
    2222// C++ std headers 
    2323#include <vector> 
  • libs/libmythtv/mpeg/pespacket.cpp

     
    55#include "mythcontext.h" 
    66 
    77extern "C" { 
    8 #include "mythconfig.h" 
    9 #include "../libavcodec/avcodec.h" 
    10 #include "../libavformat/avformat.h" 
    11 #include "../libavutil/crc.h" 
    12 #include "../libavutil/bswap.h" 
     8#include "config.h" 
     9#include "avcodec.h" 
     10#include "avformat.h" 
     11#include "crc.h" 
     12#include "bswap.h" 
    1313} 
    1414 
    1515#include <vector> 
  • libs/libmythtv/signalmonitor.cpp

     
    1010#include "mythcontext.h" 
    1111#include "signalmonitor.h" 
    1212 
    13 #include "libavcodec/avcodec.h" 
     13#include "avcodec.h" 
    1414#include "libmyth/util.h" 
    1515 
    1616#ifdef USING_DVB 
  • libs/libmythtv/DVDRingBuffer.h

     
    99#include <qobject.h> 
    1010#include <qmutex.h> 
    1111#include "util.h" 
    12 #include "../libavcodec/avcodec.h" 
     12#include "avcodec.h" 
    1313 
    1414#define DVDNAV_COMPILE 
    1515#include "../libmythdvdnav/dvdnav.h" 
  • libs/libmythtv/mhi.h

     
    1919#include <qptrqueue.h> 
    2020 
    2121// MythTV headers 
    22 #include "../libavcodec/avcodec.h" // to decode single MPEG I-frames 
     22#include "avcodec.h" // to decode single MPEG I-frames 
    2323#include "../libmythfreemheg/freemheg.h" 
    2424#include "interactivetv.h" 
    2525#include "mhi.h" 
  • libs/libmythtv/videooutbase.cpp

     
    55#include "osdsurface.h" 
    66#include "NuppelVideoPlayer.h" 
    77 
    8 #include "../libmyth/mythcontext.h" 
     8#include "mythcontext.h" 
    99 
    1010#ifdef USING_XV 
    1111#include "videoout_xv.h" 
     
    3131 
    3232#include "dithertable.h" 
    3333 
    34 #include "../libavcodec/avcodec.h" 
     34#include "avcodec.h" 
    3535 
    3636#include "filtermanager.h" 
    3737 
  • libs/libmythtv/videoout_xv.h

     
    1414#include <X11/extensions/Xvlib.h> 
    1515 
    1616#undef HAVE_AV_CONFIG_H 
    17 #include "../libavcodec/avcodec.h" 
     17#include "avcodec.h" 
    1818 
    1919class NuppelVideoPlayer; 
    2020class ChromaKeyOSD; 
  • libs/libmythtv/videosource.cpp

     
    2020#include <qdir.h> 
    2121 
    2222// MythTV headers 
    23 #include "mythconfig.h" 
     23#include "config.h" 
    2424#include "mythwidgets.h" 
    2525#include "mythcontext.h" 
    2626#include "mythdbcon.h" 
  • libs/libmythtv/selectavcdevice.cpp

     
    44 *  Distributed as part of MythTV under GPL v2 and later. 
    55 */ 
    66 
    7 #include "mythconfig.h" 
     7#include "config.h" 
    88 
    99#ifdef CONFIG_DARWIN 
    1010# include "mythcontext.h" 
  • libs/libmythtv/videoout_xv.cpp

     
    3333#include "xvmctextures.h" 
    3434 
    3535// MythTV General headers 
    36 #include "mythconfig.h" 
     36#include "config.h" 
    3737#include "mythcontext.h" 
    3838#include "filtermanager.h" 
    3939#define IGNORE_TV_PLAY_REC 
     
    5252                                      int, int, XShmSegmentInfo*); 
    5353} 
    5454 
    55 #include "../libavcodec/avcodec.h" 
     55#include "avcodec.h" 
    5656 
    5757#ifndef HAVE_ROUND 
    5858#define round(x) ((int) ((x) + 0.5)) 
  • libs/libmythtv/avformatdecoder.h

     
    1212 
    1313extern "C" { 
    1414#include "frame.h" 
    15 #include "../libavcodec/avcodec.h" 
     15#include "avcodec.h" 
    1616#include "../libavformat/avformat.h" 
    1717} 
    1818 
  • libs/libmythtv/mpegrecorder.cpp

     
    2222#include <qregexp.h> 
    2323 
    2424// avlib headers 
    25 #include "../libavcodec/avcodec.h" 
     25#include "avcodec.h" 
    2626 
    2727// MythTV headers 
    2828#include "mpegrecorder.h" 
  • libs/libmythtv/ivtvdecoder.cpp

     
    88 
    99using namespace std; 
    1010 
    11 #include "mythconfig.h" 
     11#include "config.h" 
    1212#include "ivtvdecoder.h" 
    1313#include "RingBuffer.h" 
    1414#include "NuppelVideoPlayer.h" 
  • libs/libmythtv/tv_rec.cpp

     
    1616#include <qsocket.h> 
    1717 
    1818// MythTV headers 
    19 #include "mythconfig.h" 
     19#include "config.h" 
    2020#include "tv_rec.h" 
    2121#include "osd.h" 
    2222#include "mythcontext.h" 
  • libs/libmythtv/videoout_ivtv.cpp

     
    3939#include "libmyth/mythcontext.h" 
    4040 
    4141#include "NuppelVideoPlayer.h" 
    42 #include "../libavcodec/avcodec.h" 
     42#include "avcodec.h" 
    4343#include "yuv2rgb.h" 
    4444#include "osd.h" 
    4545#include "osdsurface.h" 
  • libs/libmythtv/tv_rec.h

     
    1414#include "programinfo.h" 
    1515#include "tv.h" 
    1616 
    17 #include "mythconfig.h" 
     17#include "config.h" 
    1818 
    1919class NuppelVideoRecorder; 
    2020class RingBuffer; 
  • libs/libmythtv/crcipnetworkrecorder.cpp

     
    5454 
    5555#include "crcipnetworkrecorder.h" 
    5656 
    57 #include "../libavformat/avformat.h" 
     57#include "avformat.h" 
    5858 
    5959/* 
    6060 
  • libs/libmythtv/videobuffers.cpp

     
    44#include <unistd.h> 
    55#include "mythcontext.h" 
    66#include "videobuffers.h" 
    7 #include "../libavcodec/avcodec.h" 
     7#include "avcodec.h" 
    88 
    99#ifdef USING_XVMC 
    1010#include "videoout_xv.h" // for xvmc stuff 
  • libs/libmythtv/videoout_dx.cpp

     
    1010#include "mmsystem.h" 
    1111 
    1212extern "C" { 
    13 #include "../libavcodec/avcodec.h" 
     13#include "avcodec.h" 
    1414} 
    1515 
    1616#define PRINT_FOURCC(c) ((char) (c & 0xFF)) << ((char) ((c >> 8) & 0xFF)) << ((char) ((c >> 16) & 0xFF)) << ((char) ((c >> 24) & 0xFF)) 
  • libs/libmythmpeg2/libmythmpeg2.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythmpeg2-$$LIBVERSION 
    610CONFIG += thread staticlib warn_off 
  • libs/libmythsoundtouch/libmythsoundtouch.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythsoundtouch-$$LIBVERSION 
    610CONFIG += thread staticlib warn_off 
  • libs/libavformat/libavformat.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythavformat-$$LIBVERSION 
    610CONFIG += thread dll warn_off 
  • libs/libmythsamplerate/libmythsamplerate.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythsamplerate-$$LIBVERSION 
    610CONFIG += thread staticlib warn_off 
  • libs/libmythui/libmythui.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythui-$$LIBVERSION 
    610CONFIG += debug thread dll  
  • libs/libmyth/mythcdrom.cpp

     
    11#include "mythcdrom.h" 
    22#include <sys/stat.h> 
    33 
    4 #include "mythconfig.h" 
     4#include "config.h" 
    55#include "mythcontext.h" 
    66 
    77// For testing 
  • libs/libmyth/mythmedia.cpp

     
    1111 
    1212// MythTV headers 
    1313#include "mythmedia.h" 
    14 #include "mythconfig.h" 
     14#include "config.h" 
    1515#include "mythcontext.h" 
    1616#include "util.h" 
    1717 
  • libs/libmyth/util.cpp

     
    3030#include <qfont.h> 
    3131 
    3232// Myth headers 
    33 #include "mythconfig.h" 
     33#include "config.h" 
    3434#include "exitcodes.h" 
    3535#include "util.h" 
    3636#include "mythcontext.h" 
  • libs/libmyth/libmyth.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
     3 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
    37  
    48TEMPLATE = lib 
    59TARGET = myth-$$LIBVERSION 
  • libs/libmyth/mythmediamonitor.cpp

     
    2929#include "mythmediamonitor.h" 
    3030#include "mythcontext.h" 
    3131#include "mythdialogs.h" 
    32 #include "mythconfig.h" 
     32#include "config.h" 
    3333#include "mythcdrom.h" 
    3434#include "mythhdd.h" 
    3535 
  • libs/libmythlivemedia/libmythlivemedia.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythlivemedia-$$LIBVERSION 
    610CONFIG += thread shared warn_off 
  • libs/libavcodec/libavcodec.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythavcodec-$$LIBVERSION 
    610CONFIG += thread dll warn_off 
  • libs/libavutil/libavutil.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythavutil-$$LIBVERSION 
    610CONFIG += thread dll warn_off 
  • libs/libmythdvdnav/libmythdvdnav.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = lib 
    59TARGET = mythdvdnav-$$LIBVERSION 
    610CONFIG += thread staticlib warn_off 
  • libs/libmythfreemheg/libmythfreemheg.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../libmythtv 
    59 
    610TEMPLATE = lib 
  • libs/libmythupnp/httprequest.cpp

     
    1717#include <qfile.h> 
    1818#include <qfileinfo.h> 
    1919 
    20 #include "mythconfig.h" 
     20#include "config.h" 
    2121#ifdef CONFIG_DARWIN 
    2222#include "darwin-sendfile.h" 
    2323#else 
  • libs/libmythupnp/libmythupnp.pro

     
    11include ( ../../config.mak ) 
     2SOURCE=. 
     3exists ( sourcedir ) { 
     4    SOURCE=$$system( readlink sourcedir ) 
     5    VPATH=$$SOURCE 
     6} 
    27include ( ../../settings.pro ) 
    3   
     8 
     9INCLUDEPATH += $${SOURCE}/../libmythtv 
     10 
    411TEMPLATE = lib 
    512TARGET = mythupnp-$$LIBVERSION 
    613CONFIG += thread dll 
     
    2431SOURCES += upnpdevice.cpp upnptasknotify.cpp upnptasksearch.cpp threadpool.cpp 
    2532SOURCES += httpserver.cpp upnpcds.cpp upnpcdsobjects.cpp bufferedsocketdevice.cpp 
    2633 
    27 INCLUDEPATH += ../libmyth 
    28 INCLUDEPATH += ../.. 
    29 DEPENDPATH += ../libmythtv ../libmyth ../libavcodec 
    30 DEPENDPATH += ../libavformat 
     34INCLUDEPATH += $${SOURCE}/../libmyth 
     35INCLUDEPATH += $${SOURCE}/../.. 
     36DEPENDPATH += $${SOURCE}/../libmythtv $${SOURCE}/../libmyth $${SOURCE}/../libavcodec 
     37DEPENDPATH += $${SOURCE}/../libavformat 
    3138 
    3239LIBS += -L../libmyth -L../libmythtv -L../libavcodec 
    3340LIBS += -L../libavformat 
  • programs/mythuitest/mythuitest.pro

     
    55include ( ../../config.mak ) 
    66include ( ../../settings.pro ) 
    77 
     8exists ( sourcedir ) { 
     9   VPATH=./sourcedir $${BUILD_PATH} 
     10} 
     11 
     12 
    813TEMPLATE = app 
    914TARGET = mythuitest 
    1015CONFIG += thread opengl 
  • programs/mythfrontend/globalsettings.cpp

     
    77#include <qdir.h> 
    88#include <qimage.h> 
    99 
    10 #include "mythconfig.h" 
     10#include "config.h" 
    1111#include "mythcontext.h" 
    1212#include "mythdbcon.h" 
    1313#include "dbsettings.h" 
  • programs/mythfrontend/main.cpp

     
    1414#include <iostream> 
    1515using namespace std; 
    1616 
    17 #include "mythconfig.h" 
     17#include "config.h" 
    1818#include "tv.h" 
    1919#include "proglist.h" 
    2020#include "progfind.h" 
  • programs/mythfrontend/mythfrontend.pro

     
    33include ( ../../version.pro ) 
    44include ( ../programs-libs.pro ) 
    55 
     6exists ( sourcedir ) { 
     7   VPATH=./sourcedir $${BUILD_PATH} 
     8} 
     9 
    610TEMPLATE = app 
    711CONFIG += thread 
    812TARGET = mythfrontend 
  • programs/mythjobqueue/mythjobqueue.pro

     
    22include ( ../../settings.pro) 
    33include ( ../programs-libs.pro) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711target.path = $${PREFIX}/bin 
  • programs/mythtranscode/replex/replex.pro

     
    1 include ( ../../../config.mak ) 
     1include ( ../../config.mak ) 
     2SOURCE=. 
     3exists ( sourcedir ) { 
     4    SOURCE=$$system( readlink sourcedir ) 
     5    VPATH=$$SOURCE 
     6} 
     7 
    28include ( ../../../settings.pro) 
    39 
     10exists ( sourcedir ) { 
     11   VPATH=./sourcedir $${BUILD_PATH} 
     12} 
     13 
    414TEMPLATE = app 
    515TARGET = mythreplex 
    616target.path = $${PREFIX}/bin 
  • programs/mythtranscode/mythtranscode.pro

     
    22include ( ../../settings.pro) 
    33include ( ../programs-libs.pro) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711target.path = $${PREFIX}/bin 
  • programs/mythcommflag/mythcommflag.pro

     
    22include (../../settings.pro) 
    33include ( ../programs-libs.pro ) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711target.path = $${PREFIX}/bin 
  • programs/mythbackend/mythbackend.pro

     
    33include ( ../../version.pro ) 
    44include ( ../programs-libs.pro ) 
    55 
     6exists ( sourcedir ) { 
     7   VPATH=./sourcedir $${BUILD_PATH} 
     8} 
     9 
    610TEMPLATE = app 
    711CONFIG += thread 
    812TARGET = mythbackend 
  • programs/mythbackend/main.cpp

     
    1111#include <signal.h> 
    1212#include <cerrno> 
    1313 
    14 #include "mythconfig.h" 
     14#include "config.h" 
    1515#ifdef CONFIG_DARWIN 
    1616    #include <sys/aio.h>    // O_SYNC 
    1717#endif 
  • programs/mythtv-setup/mythtv-setup.pro

     
    22include ( ../../settings.pro ) 
    33include ( ../programs-libs.pro ) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread opengl 
    711TARGET = mythtv-setup 
  • programs/mythlcdserver/mythlcdserver.pro

     
    22include ( ../../settings.pro ) 
    33include ( ../programs-libs.pro ) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711TARGET = mythlcdserver 
  • programs/mythtv/mythtv.pro

     
    22include ( ../../settings.pro ) 
    33include ( ../programs-libs.pro ) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711TARGET = mythtv 
  • programs/mythwelcome/mythwelcome.pro

     
    22include (../../settings.pro) 
    33include (../programs-libs.pro) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711TARGET = mythwelcome 
  • programs/mythtvosd/mythtvosd.pro

     
    11include ( ../../config.mak ) 
    22include ( ../../settings.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48TEMPLATE = app 
    59CONFIG += thread 
    610TARGET = mythtvosd 
  • programs/mythfilldatabase/mythfilldatabase.pro

     
    22include ( ../../settings.pro ) 
    33include ( ../programs-libs.pro ) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711CONFIG -= moc 
  • programs/mythshutdown/mythshutdown.pro

     
    22include (../../settings.pro) 
    33include (../programs-libs.pro) 
    44 
     5exists ( sourcedir ) { 
     6   VPATH=./sourcedir $${BUILD_PATH} 
     7} 
     8 
    59TEMPLATE = app 
    610CONFIG += thread 
    711target.path = $${PREFIX}/bin 
  • filters/linearblend/filter_linearblend.c

     
    99 
    1010#include "config.h" 
    1111#include "dsputil.h" 
    12 #include "../mm_arch.h" 
     12#include "mm_arch.h" 
    1313 
    1414#define PAVGB(a,b)   "pavgb " #a ", " #b " \n\t" 
    1515#define PAVGUSB(a,b) "pavgusb " #a ", " #b " \n\t" 
  • filters/linearblend/linearblend.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
    4 INCLUDEPATH += ../../libs/libmythtv ../.. 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
    57 
     8INCLUDEPATH += ../../libs/libmythtv ../.. .. 
     9 
    610# Input 
    711SOURCES += filter_linearblend.c 
  • filters/convert/convert.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv 
    48 
    59# Input 
  • filters/quickdnr/quickdnr.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 
    59 
    610# Input 
  • filters/postprocess/postprocess.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
    4 INCLUDEPATH += ../../libs/libmythtv 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
     8INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec/libpostproc 
    59DEPENDPATH  += ../../libs/libmythtv 
    610 
    711SOURCES += filter_postprocess.c 
  • filters/postprocess/filter_postprocess.c

     
    1313#include "avcodec.h" 
    1414#include "filter.h" 
    1515#include "frame.h" 
    16 #include "../../libs/libavcodec/libpostproc/postprocess.h" 
     16#include "postprocess.h" 
    1717 
    1818static const char FILTER_NAME[] = "PostProcess"; 
    1919 
  • filters/onefield/onefield.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv 
    48 
    59# Input 
  • filters/bobdeint/bobdeint.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv 
    48 
    59# Input 
  • filters/adjust/adjust.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 
    59 
    610# Input 
  • filters/force/force.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv 
    48 
    59# Input 
  • filters/crop/crop.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 
    59 
    610# Input 
  • filters/kerneldeint/kerneldeint.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 
    59 
    610# Input 
  • filters/ivtc/ivtc.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv ../.. 
    48 
    59# Input 
  • filters/invert/invert.pro

     
    11include ( ../filter-common.pro ) 
    22 
     3exists ( sourcedir ) { 
     4   VPATH=./sourcedir $${BUILD_PATH} 
     5} 
     6 
    37INCLUDEPATH += ../../libs/libmythtv 
    48 
    59# Input 
  • filters/denoise3d/denoise3d.pro

     
    11include ( ../filter-common.pro ) 
    22include ( ../filter-avcodec.pro ) 
    33 
     4exists ( sourcedir ) { 
     5   VPATH=./sourcedir $${BUILD_PATH} 
     6} 
     7 
    48INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 
    59 
    610# Input