Skip to content

Commit

Permalink
Silence qmake warnings about deprecated TARGETDEPS.
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartm committed Feb 4, 2011
1 parent 752ae31 commit 14551a4
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions mythplugins/targetdep.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DEPLIBS = $${LIBDIR}
# On Windows, dlls were installed with exes:
mingw : DEPLIBS = $${PREFIX}/bin

TARGETDEPS += $${DEPLIBS}/libmyth-$${MYTH_SHLIB_EXT}
TARGETDEPS += $${DEPLIBS}/libmythbase-$${MYTH_SHLIB_EXT}
TARGETDEPS += $${DEPLIBS}/libmythui-$${MYTH_SHLIB_EXT}
TARGETDEPS += $${DEPLIBS}/libmythupnp-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += $${DEPLIBS}/libmyth-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += $${DEPLIBS}/libmythbase-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += $${DEPLIBS}/libmythui-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += $${DEPLIBS}/libmythupnp-$${MYTH_SHLIB_EXT}
6 changes: 3 additions & 3 deletions mythtv/filters/filter-avcodec.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ LIBS += -L../../external/FFmpeg/libavcore -lmythavcore
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil

# Rebuild (link) this filter if the lib changes
TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
12 changes: 6 additions & 6 deletions mythtv/libs/libmyth/libmyth.pro
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ LIBS += -L../../external/FFmpeg/libavcore -lmythavcore
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../external/FFmpeg/libavformat -lmythavformat

TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT}
TARGETDEPS += ../libmythfreesurround/libmythfreesurround-$${MYTH_LIB_EXT}
TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
POST_TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT}
POST_TARGETDEPS += ../libmythfreesurround/libmythfreesurround-$${MYTH_LIB_EXT}
POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
POST_TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)

# Install headers so that plugins can compile independently
inc.path = $${PREFIX}/include/mythtv/
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythtv/libmythtv.pro
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ using_hdhomerun: LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
using_backend: LIBS += -lmp3lame
LIBS += $$EXTRA_LIBS $$QMAKE_LIBS_DYNLOAD

TARGETDEPS += ../libmyth/libmyth-$${MYTH_SHLIB_EXT}
TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale)
TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${MYTH_LIB_EXT}
TARGETDEPS += ../libmythbluray/libmythbluray-$${MYTH_LIB_EXT}
POST_TARGETDEPS += ../libmyth/libmyth-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
POST_TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
POST_TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale)
POST_TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${MYTH_LIB_EXT}
POST_TARGETDEPS += ../libmythbluray/libmythbluray-$${MYTH_LIB_EXT}
using_mheg: TARGETDEPS += ../libmythfreemheg/libmythfreemheg-$${MYTH_SHLIB_EXT}
using_live: TARGETDEPS += ../libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
using_hdhomerun: TARGETDEPS += ../libmythhdhomerun/libmythhdhomerun-$${MYTH_SHLIB_EXT}
Expand Down
8 changes: 4 additions & 4 deletions mythtv/programs/mythtranscode/replex/replex.pro
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ isEmpty(QMAKE_EXTENSION_SHLIB) {
QMAKE_EXTENSION_SHLIB=so
}

TARGETDEPS += ../../../external/FFmpeg/libavutil/$$avLibName(avutil)
TARGETDEPS += ../../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
TARGETDEPS += ../../../external/FFmpeg/libavcore/$$avLibName(avcore)
TARGETDEPS += ../../../external/FFmpeg/libavformat/$$avLibName(avformat)
POST_TARGETDEPS += ../../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
POST_TARGETDEPS += ../../../external/FFmpeg/libavcore/$$avLibName(avcore)
POST_TARGETDEPS += ../../../external/FFmpeg/libavformat/$$avLibName(avformat)

DEPENDPATH += ../../../external/FFmpeg

Expand Down
20 changes: 10 additions & 10 deletions mythtv/programs/programs-libs.pro
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ mingw {
CONFIG += console
}

TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
TARGETDEPS += ../../libs/libmyth/libmyth-$${MYTH_SHLIB_EXT}
TARGETDEPS += ../../libs/libmythtv/libmythtv-$${MYTH_SHLIB_EXT}
TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale)
TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
TARGETDEPS += ../../libs/libmythbase/libmythbase-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../libs/libmyth/libmyth-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../libs/libmythtv/libmythtv-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
POST_TARGETDEPS += ../../external/FFmpeg/libavcore/$$avLibName(avcore)
POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
POST_TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale)
POST_TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
POST_TARGETDEPS += ../../libs/libmythbase/libmythbase-$${MYTH_SHLIB_EXT}
using_live: TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
using_hdhomerun: TARGETDEPS += ../../libs/libmythhdhomerun/libmythhdhomerun-$${MYTH_SHLIB_EXT}

Expand Down

0 comments on commit 14551a4

Please sign in to comment.