optimized qmake files

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7030 90c681e8-e032-0410-971d-27865f9a5e38

17 files changed, 0 insertions, 87 deletions

diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index b5759e714..25be00d73 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -10,12 +10,10 @@ SOURCES += decoder_aac.cpp \
     aacmetadatamodel.cpp
 TARGET = $$PLUGINS_PREFIX/Input/aac
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libaac.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -lfaad \
     -L/usr/lib \
@@ -23,6 +21,5 @@ LIBS += -lqmmp \
 PKGCONFIG += taglib
 
 RESOURCES = translations/translations.qrc
-isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Input
 INSTALLS += target
diff --git a/src/plugins/Input/archive/archive.pro b/src/plugins/Input/archive/archive.pro
index 55c5d06dc..d10d22e8c 100644
--- a/src/plugins/Input/archive/archive.pro
+++ b/src/plugins/Input/archive/archive.pro
@@ -16,32 +16,22 @@ SOURCES += \
 
 TARGET=$$PLUGINS_PREFIX/Input/archive
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libarchive taglib
     QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libarc.so
 }
 
 win32 {
-#    HEADERS += ../../../../src/qmmp/metadatamodel.h \
-#               ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -larchive -ltag
 }
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index 903202edf..dbd9cfcac 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -7,8 +7,6 @@ SOURCES += decoder_cdaudio.cpp \
            decodercdaudiofactory.cpp \
            settingsdialog.cpp
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -22,12 +20,8 @@ RESOURCES = translations/translations.qrc
 FORMS += settingsdialog.ui
 
 unix {
-  QMAKE_LIBDIR += ../../../../lib
   LIBS += -lqmmp -L/usr/lib  -I/usr/include
   PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb
-  isEmpty(LIB_DIR) {
-    LIB_DIR = /lib
-  }
   target.path = $$LIB_DIR/qmmp/Input
   QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcdaudio.so
   INSTALLS += target
@@ -36,6 +30,5 @@ unix {
 win32 {
   HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-  QMAKE_LIBDIR += ../../../../bin
   LIBS += -lqmmp0 -lcdio -lcdio_paranoia -lcdio_cdda  -lm -lwinmm -mwindows -liconv -lcddb -lws2_32
 }
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index 1685a98f3..141f4576c 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -14,17 +14,14 @@ win32:HEADERS += ../../../../src/qmmp/decoder.h \
     ../../../../src/qmmp/statehandler.h
 TARGET = $$PLUGINS_PREFIX/Input/cue
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libcue.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
 unix{
-   QMAKE_LIBDIR += ../../../../lib
    LIBS += -lqmmp -L/usr/lib
 }
 
 win32{
-   QMAKE_LIBDIR += ../../../../bin
    LIBS += -lqmmp0
 }
 
@@ -38,7 +35,6 @@ contains(CONFIG, WITH_ENCA){
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 }
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index 32fefa1d3..fa779ece7 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -11,10 +11,6 @@ SOURCES += decoder_ffmpeg.cpp \
     ffmpegmetadatamodel.cpp \
     replaygainreader.cpp
 
-INCLUDEPATH += ../../../
-
-
-
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
@@ -23,12 +19,10 @@ TEMPLATE = lib
 TARGET = $$PLUGINS_PREFIX/Input/ffmpeg
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so
     LIBS += -lqmmp
-    QMAKE_LIBDIR += ../../../../lib
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
@@ -36,7 +30,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll
 }
 
diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
index 1e92b1976..ff4e0ff31 100644
--- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
+++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
@@ -9,9 +9,6 @@ SOURCES += decoder_ffmpeg.cpp \
     settingsdialog.cpp \
     ffmpegmetadatamodel.cpp
 
-INCLUDEPATH += ../../../
-
-
 
 CONFIG += warn_on \
     plugin \
@@ -21,12 +18,10 @@ TEMPLATE = lib
 TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg_legacy.so
     LIBS += -lqmmp
-    QMAKE_LIBDIR += ../../../../lib
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
@@ -34,7 +29,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll
 }
 
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index e412b1eb4..9f2119db6 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -12,17 +12,14 @@ SOURCES += decoder_flac.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/flac
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += taglib flac
@@ -33,6 +30,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lflac -logg -ltag.dll -lm
 }
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index a204c134a..5ee416910 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -10,7 +10,6 @@ SOURCES += decoder_gme.cpp \
     settingsdialog.cpp
 TARGET = $$PLUGINS_PREFIX/Input/gme
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libgme.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
@@ -18,10 +17,8 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix{
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp \
       -L/usr/lib \
       -L/usr/local/lib \
@@ -33,7 +30,6 @@ unix{
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lgme.dll
 }
 
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index e7d9156db..4881bf66b 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -14,8 +14,6 @@ SOURCES += decoder_mad.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/mad
 
-INCLUDEPATH += ../../../
-
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
@@ -23,11 +21,9 @@ TEMPLATE = lib
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp -lmad
     PKGCONFIG += taglib mad
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmad.so
@@ -36,6 +32,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmad -ltag.dll
 }
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index dc2d5a9bb..87674b31d 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -14,21 +14,17 @@ TARGET = $$PLUGINS_PREFIX/Input/modplug
 
 DEFINES += HAVE_STDINT_H \
     HAVE_INTTYPES_H
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libmodplug
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmodplug.so
@@ -37,7 +33,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmodplug
     DEFINES -= UNICODE
 }
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index 93ed9df2c..3044da310 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -8,16 +8,13 @@ SOURCES += decoder_mpc.cpp \
     mpcmetadatamodel.cpp
 TARGET = $$PLUGINS_PREFIX/Input/mpc
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -30,7 +27,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmpcdec -ltag.dll
     #DEFINES += MPC_OLD_API
 }
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index 3276e6f7b..98d2b7cbd 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -16,18 +16,14 @@ SOURCES += decoder_opus.cpp \
     tdebug.cpp
 TARGET = $$PLUGINS_PREFIX/Input/opus
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-
 unix {
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -39,6 +35,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lopusfile -lopus -ltag.dll -lm
 }
diff --git a/src/plugins/Input/sid/sid.pro b/src/plugins/Input/sid/sid.pro
index f31bb1707..d4661caa2 100644
--- a/src/plugins/Input/sid/sid.pro
+++ b/src/plugins/Input/sid/sid.pro
@@ -14,7 +14,6 @@ FORMS += \
 
 TARGET = $$PLUGINS_PREFIX/Input/sid
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libsid.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
           plugin \
           link_pkgconfig
@@ -23,10 +22,8 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix{
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libsidplayfp
 }
@@ -34,6 +31,5 @@ unix{
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lsidplayfp.dll
 }
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index c583386e5..0033f2fd5 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -7,24 +7,18 @@ SOURCES += decoder_sndfile.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Input/sndfile
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += sndfile
     QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libsndfile.so
@@ -33,6 +27,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lsndfile -lflac -lvorbisenc -lvorbis -logg
 }
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 1e841171c..bb6357522 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -10,17 +10,14 @@ SOURCES += decoder_vorbis.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/vorbis
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -32,7 +29,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lvorbisfile -lvorbis -logg -ltag.dll -lm
     LD_FLAGS += -no-undefined
 }
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index b8b4b28b9..1439c2b71 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -12,21 +12,17 @@ SOURCES += decoder_wavpack.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/wavpack
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += wavpack
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwavpack.so
@@ -35,6 +31,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lwavpack
 }
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index 566489524..2c1dc2f5a 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -10,17 +10,14 @@ SOURCES += decoder_wildmidi.cpp \
     settingsdialog.cpp
 TARGET = $$PLUGINS_PREFIX/Input/wildmidi
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwildmidi.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include \
     -lWildMidi
 
 RESOURCES = translations/translations.qrc
-isEmpty (LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Input
 INSTALLS += target