optimized qmake files

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

18 files changed, 13 insertions, 117 deletions

diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index 6808448b7..938601bb7 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -10,19 +9,15 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
 PKGCONFIG += taglib
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc presets.qrc
+
 unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/copypaste/copypaste.pro b/src/plugins/General/copypaste/copypaste.pro
index ca77c3d2f..6610a4f2f 100644
--- a/src/plugins/General/copypaste/copypaste.pro
+++ b/src/plugins/General/copypaste/copypaste.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcopypaste.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
-unix : LIBS += -lqmmpui -lqmmp
+unix:LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
-win32 : LIBS += -lqmmpui0 -lqmmp0
+win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/covermanager/covermanager.pro b/src/plugins/General/covermanager/covermanager.pro
index 72caa1482..311798b3b 100644
--- a/src/plugins/General/covermanager/covermanager.pro
+++ b/src/plugins/General/covermanager/covermanager.pro
@@ -2,8 +2,6 @@ include(../../plugins.pri)
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
-win32:QMAKE_LIBDIR += ../../../../bin
 TARGET = $$PLUGINS_PREFIX/General/covermanager
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcovermanager.so
 TRANSLATIONS = translations/covermanager_plugin_cs.ts \
@@ -24,8 +22,7 @@ TRANSLATIONS = translations/covermanager_plugin_cs.ts \
 
 RESOURCES = translations/translations.qrc \
             images/cm_images.qrc
-unix { 
-    isEmpty(LIB_DIR):LIB_DIR = /lib
+unix {
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
@@ -37,9 +34,8 @@ SOURCES += covermanagerfactory.cpp \
     coverwidget.cpp \
     covermanager.cpp
 QT += network
-INCLUDEPATH += ../../../
+
 unix:LIBS += -lqmmpui \
     -lqmmp
 win32:LIBS += -lqmmpui0 \
     -lqmmp0
-FORMS += 
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index c03a7f81c..e132670f9 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
 unix : LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
 win32 : LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro
index 1c693f1b7..429c92848 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/gnomehotkey
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -26,6 +22,4 @@ HEADERS += gnomehotkeyfactory.h \
 SOURCES += gnomehotkeyfactory.cpp \
     mediakeys.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 0ba95a02b..083042183 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/hal
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += halfactory.cpp \
            haldevice.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index f166ebae1..438c981e6 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -10,7 +10,6 @@ TARGET = $$PLUGINS_PREFIX/General/hotkey
 

 

 TEMPLATE = lib

-QMAKE_LIBDIR += ../../../../lib

 

 RESOURCES = translations/translations.qrc

 

@@ -30,16 +29,9 @@ SOURCES += hotkeyfactory.cpp \
 FORMS += settingsdialog.ui \

          hotkeydialog.ui

 

-

-INCLUDEPATH += ../../../../src

-

 unix {

-    isEmpty(LIB_DIR){

-        LIB_DIR = /lib

-    }

     target.path = $$LIB_DIR/qmmp/General

     INSTALLS += target

-    QMAKE_LIBDIR += ../../../../lib

     QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so

     PKGCONFIG += x11

     DEFINES += HAVE_XKBLIB_H

@@ -47,7 +39,5 @@ unix {
 }

 

 win32 {

-    QMAKE_LIBDIR += ../../../../bin

     LIBS += -lqmmpui0 -lqmmp0

 }

-

diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 49d0acbcd..7de78438b 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -2,7 +2,6 @@
 # Project created by QtCreator 2009-10-14T17:55:38
 # -------------------------------------------------
 include(../../plugins.pri)
-INCLUDEPATH += ../../../../src
 QT += dbus
 CONFIG += warn_on \
     plugin
@@ -10,12 +9,10 @@ unix:TARGET = $$PLUGINS_PREFIX/General/kdenotify
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
 TEMPLATE = lib
 unix {
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index ccb4f3ca8..88336bd95 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,13 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
-unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
+
+unix {
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index 096bce200..934d2fbb5 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -9,19 +9,11 @@ TARGET =$$PLUGINS_PREFIX/General/mpris
 QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-#FORMS += settingsdialog.ui
-
-#RESOURCES += images/images.qrc
-
 
 HEADERS += mprisfactory.h \
            mpris.h  \
@@ -39,6 +31,4 @@ SOURCES += mprisfactory.cpp \
            mpris2/root2object.cpp \
            mpris2/player2object.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 3cff90fa1..5e33b5fd3 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,22 +8,17 @@ unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
 unix {
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-    CONFIG += link_pkgconfig
-    PKGCONFIG += x11
-}
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
+  CONFIG += link_pkgconfig
+  PKGCONFIG += x11
+  target.path = $$LIB_DIR/qmmp/General
+  INSTALLS += target
 }
 
 HEADERS += notifierfactory.h \
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index 462d26c22..fd8656de2 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -10,17 +9,12 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/librgscan.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0 -ltag.dll
 
 RESOURCES = translations/translations.qrc
 unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 PKGCONFIG += taglib
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index ff34ea725..16931c7a1 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -2,14 +2,11 @@ include(../../plugins.pri)
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
-win32:QMAKE_LIBDIR += ../../../../bin
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
@@ -26,7 +23,6 @@ SOURCES += scrobblerfactory.cpp \
     scrobblercache.cpp \
     scrobbler.cpp
 QT += network
-INCLUDEPATH += ../../../
 unix:LIBS += -lqmmpui \
     -lqmmp
 win32:LIBS += -lqmmpui0 \
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 3da40e0b6..4228d60f6 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -1,5 +1,4 @@
 include(../../plugins.pri)
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
     plugin
 unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
@@ -7,19 +6,16 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so
 win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
 TEMPLATE = lib
 unix {
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmpui0 \
         -lqmmp0
 }
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro
index abf3fcd26..1bf1235de 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,13 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstreambrowser.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
-unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
+
+unix {
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro
index cc88f1ba6..f5b0264e1 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
 unix : LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
 win32 : LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro
index c6c906c29..b3f1c8d41 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/udisks
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += udisksfactory.cpp \
            udisksdevice.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 7e76eb3f0..484229668 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/udisks2
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += udisks2factory.cpp \
            udisks2device.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui