reformat .pro files

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

69 files changed, 438 insertions, 527 deletions

diff --git a/src/app/app.pro b/src/app/app.pro
index 9773bc79c..de16fb97a 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,40 +1,30 @@
 include(../../qmmp.pri)
 
-HEADERS += qmmpstarter.h \
-           builtincommandlineoption.h \
-    lxdesupport.h \
-    qmmpapplication.h
-
-SOURCES += \
-           qmmpstarter.cpp \
-           builtincommandlineoption.cpp \
-    lxdesupport.cpp \
-    main.cpp \
-    qmmpapplication.cpp
-
+TEMPLATE = app
 
-# Some conf to redirect intermediate stuff in separate dirs
-QT += network
 unix:TARGET = ../../bin/qmmp
 win32:TARGET = ../../../bin/qmmp
-CONFIG += thread \
-    warn_on
-QMAKE_LIBDIR += ../../lib \
-    qmmpui
 
-unix:LIBS += -L../../lib \
-    -lqmmp \
-    -lqmmpui
-win32:LIBS += -L../../bin \
-    -lqmmp0 \
-    -lqmmpui0
+QT += network
 
-win32:RC_FILE = qmmp.rc
+HEADERS += qmmpstarter.h \
+           builtincommandlineoption.h \
+           lxdesupport.h \
+           qmmpapplication.h
+
+SOURCES += qmmpstarter.cpp \
+           builtincommandlineoption.cpp \
+           lxdesupport.cpp \
+           main.cpp \
+           qmmpapplication.cpp
+
+RESOURCES = images/images.qrc translations/qmmp_locales.qrc
 
 INCLUDEPATH += ../
-RESOURCES = images/images.qrc
-TEMPLATE = app
+LIBS += -lqmmp -lqmmpui
+
 unix {
+    QMAKE_LIBDIR += ../../lib
     target.path = /bin
     desktop.files = qmmp.desktop \
         qmmp_enqueue.desktop \
@@ -56,4 +46,8 @@ unix {
         icon48 \
         icon_svg
 }
-RESOURCES += translations/qmmp_locales.qrc
+
+win32 {
+    QMAKE_LIBDIR += ../../bin
+    RC_FILE = qmmp.rc
+}
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index d8aa5135a..1e3558c8e 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
@@ -1,15 +1,14 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/CommandLineOptions/incdecvolumeoption
-QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libincdecvolumeoption.so
+TARGET = $$PLUGINS_PREFIX/CommandLineOptions/incdecvolumeoption
 
-RESOURCES = translations/translations.qrc
+HEADERS += incdecvolumeoption.h
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
-INSTALLS += target
+SOURCES += incdecvolumeoption.cpp
 
-LIBS += -lqmmpui
+RESOURCES = translations/translations.qrc
 
-HEADERS += incdecvolumeoption.h
+LIBS += -lqmmpui
 
-SOURCES += incdecvolumeoption.cpp
+target.path = $$LIB_DIR/qmmp/CommandLineOptions
+INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
index 37dbd9cc3..4887aa86e 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
+++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
@@ -1,15 +1,14 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/CommandLineOptions/playlistoption
-QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libplaylistoption.so
+TARGET = $$PLUGINS_PREFIX/CommandLineOptions/playlistoption
 
-RESOURCES = translations/translations.qrc
+HEADERS += playlistoption.h
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
-INSTALLS += target
+SOURCES += playlistoption.cpp
 
-LIBS += -lqmmpui
+RESOURCES = translations/translations.qrc
 
-HEADERS += playlistoption.h
+LIBS += -lqmmpui
 
-SOURCES += playlistoption.cpp
+target.path = $$LIB_DIR/qmmp/CommandLineOptions
+INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
index 3b645e3dd..128ae4962 100644
--- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
+++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
@@ -1,15 +1,14 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/CommandLineOptions/seekoption
-QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libseekoption.so
 
-RESOURCES = translations/translations.qrc
+HEADERS += seekoption.h
 
-target.path = $$LIB_DIR/qmmp/CommandLineOptions
-INSTALLS += target
+SOURCES += seekoption.cpp
 
 LIBS += -lqmmpui
 
-HEADERS += seekoption.h
+RESOURCES = translations/translations.qrc
 
-SOURCES += seekoption.cpp
+target.path = $$LIB_DIR/qmmp/CommandLineOptions
+INSTALLS += target
diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
index fc60cbdb9..b5cb6188f 100644
--- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
+++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
@@ -1,7 +1,6 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/CommandLineOptions/statusoption
-QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libstatusoption.so
 
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro
index 8378b9943..49472b97a 100644
--- a/src/plugins/Effect/bs2b/bs2b.pro
+++ b/src/plugins/Effect/bs2b/bs2b.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Effect/bs2b
+
 HEADERS += bs2bplugin.h \
            effectbs2bfactory.h \
            settingsdialog.h
@@ -8,21 +10,17 @@ SOURCES += bs2bplugin.cpp \
            effectbs2bfactory.cpp \
            settingsdialog.cpp
 
-TARGET =$$PLUGINS_PREFIX/Effect/bs2b
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-FORMS += settingsdialog.ui
-
 unix {
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
-
     PKGCONFIG += libbs2b
-    LIBS += -lqmmp -L/usr/lib -I/usr/include
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libbs2b.so
+    LIBS += -L/usr/lib -I/usr/include
 }
 
 win32 {
-    LIBS += -lqmmp0 -lbs2b
+    LIBS += -lbs2b
 }
diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro
index db0348ad7..84378c3e8 100644
--- a/src/plugins/Effect/crossfade/crossfade.pro
+++ b/src/plugins/Effect/crossfade/crossfade.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Effect/crossfade
+
 HEADERS += crossfadeplugin.h \
            effectcrossfadefactory.h \
            settingsdialog.h
@@ -8,16 +10,11 @@ SOURCES += crossfadeplugin.cpp \
            effectcrossfadefactory.cpp \
            settingsdialog.cpp
 
-TARGET =$$PLUGINS_PREFIX/Effect/crossfade
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-FORMS += settingsdialog.ui
-
 unix {
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libcrossfade.so
 }
-
-
diff --git a/src/plugins/Effect/filewriter/filewriter.pro b/src/plugins/Effect/filewriter/filewriter.pro
index 937044e5e..1ea616dee 100644
--- a/src/plugins/Effect/filewriter/filewriter.pro
+++ b/src/plugins/Effect/filewriter/filewriter.pro
@@ -1,31 +1,28 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Effect/filewriter
+
 HEADERS += effectfilewriterfactory.h \
-    filewriterplugin.h \
-    settingsdialog.h
+           filewriterplugin.h \
+           settingsdialog.h
 
 SOURCES += effectfilewriterfactory.cpp \
-    filewriterplugin.cpp \
-    settingsdialog.cpp
+           filewriterplugin.cpp \
+           settingsdialog.cpp
 
-TARGET =$$PLUGINS_PREFIX/Effect/filewriter
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
+LIBS += -lqmmpui
+
 unix {
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
-
-    LIBS += -lqmmp -lqmmpui
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libfilewriter.so
     PKGCONFIG += ogg vorbis vorbisenc
 }
 
 win32 {
-    LIBS += -lqmmp0 -lqmmpui0 -lvorbisfile -lvorbis -logg -lvorbisenc
+    LIBS += -lvorbisfile -lvorbis -logg -lvorbisenc
     LD_FLAGS += -no-undefined
 }
-
-FORMS += \
-    settingsdialog.ui
-
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index 2b8f94d84..7fb3402e7 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -1,4 +1,7 @@
 include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/Effect/ladspa
+
 HEADERS += ladspahost.h \
     effectladspafactory.h \
     settingsdialog.h \
@@ -6,6 +9,7 @@ HEADERS += ladspahost.h \
     ladspa.h \
     ladspahelper.h \
     ladspabutton.h
+
 SOURCES += ladspahost.cpp \
     effectladspafactory.cpp \
     settingsdialog.cpp \
@@ -13,14 +17,12 @@ SOURCES += ladspahost.cpp \
     ladspahelper.cpp \
     ladspabutton.cpp
 
-TARGET = $$PLUGINS_PREFIX/Effect/ladspa
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Effect/libladspa.so
+FORMS += settingsdialog.ui
 
-LIBS += -L/usr/lib -I/usr/include
+RESOURCES = translations/translations.qrc
 
+LIBS += -L/usr/lib -I/usr/include
 linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl
 
-RESOURCES = translations/translations.qrc
 target.path = $$LIB_DIR/qmmp/Effect
 INSTALLS += target
-FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/soxr/soxr.pro b/src/plugins/Effect/soxr/soxr.pro
index a5cf61f80..904146726 100644
--- a/src/plugins/Effect/soxr/soxr.pro
+++ b/src/plugins/Effect/soxr/soxr.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Effect/soxr
+
 HEADERS += soxresampler.h \
  effectsoxrfactory.h \
  settingsdialog.h
@@ -8,8 +10,7 @@ SOURCES += soxresampler.cpp \
  effectsoxrfactory.cpp \
  settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Effect/soxr
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libsoxr.so
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
@@ -23,6 +24,3 @@ unix {
 win32 {
     LIBS += -lsoxr
 }
-
-FORMS += settingsdialog.ui
-
diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro
index ee783eaa8..1b1af5173 100644
--- a/src/plugins/Effect/stereo/stereo.pro
+++ b/src/plugins/Effect/stereo/stereo.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Effect/stereo
+
 HEADERS += stereoplugin.h \
            effectstereofactory.h \
            settingsdialog.h
@@ -8,16 +10,11 @@ SOURCES += stereoplugin.cpp \
            effectstereofactory.cpp \
            settingsdialog.cpp
 
-TARGET =$$PLUGINS_PREFIX/Effect/stereo
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-FORMS += settingsdialog.ui
-
 unix {
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
-
-
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libstereo.so
 }
diff --git a/src/plugins/Engines/mplayer/mplayer.pro b/src/plugins/Engines/mplayer/mplayer.pro
index cc3ee8065..e6d9abad0 100644
--- a/src/plugins/Engines/mplayer/mplayer.pro
+++ b/src/plugins/Engines/mplayer/mplayer.pro
@@ -1,16 +1,20 @@
 include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/Engines/mplayer
+
 HEADERS += mplayerenginefactory.h \
     mplayerengine.h \
     settingsdialog.h \
     mplayermetadatamodel.h
+
 SOURCES += mplayerengine.cpp \
     mplayerenginefactory.cpp \
     settingsdialog.cpp \
     mplayermetadatamodel.cpp
-TARGET = $$PLUGINS_PREFIX/Engines/mplayer
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Engines/libmplayer.so
+
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
+
 target.path = $$LIB_DIR/qmmp/Engines
 INSTALLS += target
-FORMS += settingsdialog.ui
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
index 8e83dc49b..57a90e27a 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
+++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
@@ -1,7 +1,6 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/FileDialogs/qmmpfiledialog
-
+TARGET = $$PLUGINS_PREFIX/FileDialogs/qmmpfiledialog
 
 HEADERS += qmmpfiledialog.h \
            qmmpfiledialogimpl.h
@@ -18,7 +17,4 @@ LIBS += -lqmmpui
 unix {
     target.path = $$LIB_DIR/qmmp/FileDialogs
     INSTALLS += target
-
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/FileDialogs/libqmmpfiledialog.so
-
 }
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
index a7ecc3624..b4e983261 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
@@ -1,7 +1,6 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/FileDialogs/twopanelfiledialog
-
+TARGET = $$PLUGINS_PREFIX/FileDialogs/twopanelfiledialog
 
 HEADERS += twopanelfiledialog.h \
            twopanelfiledialogimpl.h
@@ -19,7 +18,4 @@ RESOURCES += translations/translations.qrc
 unix {
     target.path = $$LIB_DIR/qmmp/FileDialogs
     INSTALLS += target
-
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/FileDialogs/libtwopanelfiledialog.so
-
 }
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index de458d4eb..ef617cd4e 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -1,19 +1,9 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/General/converter
 
-TARGET =$$PLUGINS_PREFIX/General/converter
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so
 
-LIBS += -lqmmpui
-
-PKGCONFIG += taglib
-
-RESOURCES = translations/translations.qrc presets.qrc
 
-unix{
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
-}
 HEADERS += converterfactory.h \
     converterhelper.h \
     converterdialog.h \
@@ -28,3 +18,13 @@ SOURCES += converterfactory.cpp \
 
 FORMS += converterdialog.ui \
     preseteditor.ui
+
+RESOURCES = translations/translations.qrc presets.qrc
+
+LIBS += -lqmmpui
+PKGCONFIG += taglib
+
+unix{
+    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 dba9e5b39..95c724d04 100644
--- a/src/plugins/General/copypaste/copypaste.pro
+++ b/src/plugins/General/copypaste/copypaste.pro
@@ -1,18 +1,18 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/copypaste
-unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcopypaste.so
+TARGET = $$PLUGINS_PREFIX/General/copypaste
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
 HEADERS += copypastefactory.h \
            copypaste.h
 
 SOURCES += copypastefactory.cpp \
            copypaste.cpp
 
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
+
+unix {
+    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 c74960bfd..c147e5a41 100644
--- a/src/plugins/General/covermanager/covermanager.pro
+++ b/src/plugins/General/covermanager/covermanager.pro
@@ -1,15 +1,9 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/General/covermanager
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcovermanager.so
 
+QT += network
 
-RESOURCES = translations/translations.qrc \
-            images/cm_images.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
 HEADERS += covermanagerfactory.h \
     coverwidget.h \
     covermanager.h
@@ -18,5 +12,12 @@ SOURCES += covermanagerfactory.cpp \
     coverwidget.cpp \
     covermanager.cpp
 
-QT += network
+RESOURCES = translations/translations.qrc \
+            images/cm_images.qrc
+
 LIBS += -lqmmpui
+
+unix {
+    target.path = $$LIB_DIR/qmmp/General
+    INSTALLS += target
+}
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index 79b5cf895..a3252b689 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -1,15 +1,7 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/fileops
-unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so
+TARGET = $$PLUGINS_PREFIX/General/fileops
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
 HEADERS += fileopsfactory.h \
            fileops.h \
            settingsdialog.h \
@@ -23,4 +15,11 @@ SOURCES += fileopsfactory.cpp \
 FORMS += settingsdialog.ui \
          hotkeydialog.ui
 
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
 
+unix {
+    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 0968f35ed..7bafffe5f 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -1,15 +1,8 @@
 include(../../plugins.pri)
 
-QT += dbus
-
 TARGET = $$PLUGINS_PREFIX/General/gnomehotkey
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so
-
-RESOURCES = translations/translations.qrc
-
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
 
+QT += dbus
 
 HEADERS += gnomehotkeyfactory.h \
     mediakeys.h
@@ -17,4 +10,9 @@ HEADERS += gnomehotkeyfactory.h \
 SOURCES += gnomehotkeyfactory.cpp \
     mediakeys.cpp
 
+RESOURCES = translations/translations.qrc
+
 LIBS += -lqmmpui
+
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 22b577958..2fca9bf0c 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -1,15 +1,8 @@
 include(../../plugins.pri)
 
-QT += dbus
-
 TARGET = $$PLUGINS_PREFIX/General/hal
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
-
-RESOURCES = translations/translations.qrc
-
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
 
+QT += dbus
 
 HEADERS += halfactory.h \
            halplugin.h \
@@ -23,6 +16,12 @@ SOURCES += halfactory.cpp \
            haldevice.cpp \
            settingsdialog.cpp
 
+FORMS += settingsdialog.ui
+
+
+RESOURCES = translations/translations.qrc
+
 LIBS += -lqmmpui
 
-FORMS += settingsdialog.ui
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index a97191bcd..335d9b1ec 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -2,10 +2,6 @@ include(../../plugins.pri)
 

 TARGET = $$PLUGINS_PREFIX/General/hotkey

 

-RESOURCES = translations/translations.qrc

-

-target.path = $$LIB_DIR/qmmp/General

-

 HEADERS += hotkeyfactory.h \

            hotkeymanager.h \

            settingsdialog.h \

@@ -20,14 +16,13 @@ SOURCES += hotkeyfactory.cpp \
 FORMS += settingsdialog.ui \

          hotkeydialog.ui

 

+RESOURCES = translations/translations.qrc

+

+LIBS += -lqmmpui

+

 unix {

     target.path = $$LIB_DIR/qmmp/General

     INSTALLS += target

-    QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so

     PKGCONFIG += x11

     DEFINES += HAVE_XKBLIB_H

 }

-

-

-LIBS += -lqmmpui

-

diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 75b7f11d2..5577e7433 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -2,26 +2,27 @@
 # Project created by QtCreator 2009-10-14T17:55:38
 # -------------------------------------------------
 include(../../plugins.pri)
-QT += dbus
 
 TARGET = $$PLUGINS_PREFIX/General/kdenotify
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
-LIBS += -lqmmpui
 
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
+QT += dbus
+
 SOURCES += kdenotifyfactory.cpp \
     kdenotify.cpp \
     settingsdialog.cpp
+
 HEADERS += kdenotifyfactory.h \
     kdenotify.h \
     settingsdialog.h
-RESOURCES += translations/translations.qrc
+
 FORMS += settingsdialog.ui
 
+RESOURCES += translations/translations.qrc
+
+LIBS += -lqmmpui
+
+target.path = $$LIB_DIR/qmmp/General
 images.files = images/app_icon.png \
                images/empty_cover.png
 images.path = /share/qmmp/images/
-INSTALLS += images
+INSTALLS += target images
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index d4007b6de..41c0aa4f1 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -1,25 +1,24 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/lyrics
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
+TARGET = $$PLUGINS_PREFIX/General/lyrics
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
+QT += network
 
-unix {
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
-}
 HEADERS += lyricsfactory.h \
            lyrics.h \
            lyricswindow.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += lyricsfactory.cpp \
            lyrics.cpp \
            lyricswindow.cpp
 
 FORMS += lyricswindow.ui
 
-QT += network
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
 
+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 5a1518440..4fdbcce76 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -1,14 +1,8 @@
 include(../../plugins.pri)
 
-QT += dbus
-
-TARGET =$$PLUGINS_PREFIX/General/mpris
-QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so
-
-RESOURCES = translations/translations.qrc
+TARGET = $$PLUGINS_PREFIX/General/mpris
 
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
+QT += dbus
 
 HEADERS += mprisfactory.h \
            mpris.h  \
@@ -26,4 +20,9 @@ SOURCES += mprisfactory.cpp \
            mpris2/root2object.cpp \
            mpris2/player2object.cpp
 
+RESOURCES = translations/translations.qrc
+
 LIBS += -lqmmpui
+
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 5380030f9..6da83f8dc 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -1,29 +1,26 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/General/notifier
 
-TARGET =$$PLUGINS_PREFIX/General/notifier
-unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
+HEADERS += notifierfactory.h \
+           notifier.h \
+           popupwidget.h \
+           settingsdialog.h
 
-LIBS += -lqmmpui
+SOURCES += notifierfactory.cpp \
+           notifier.cpp \
+           popupwidget.cpp \
+           settingsdialog.cpp
+
+FORMS += settingsdialog.ui
 
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
+LIBS += -lqmmpui
+
 unix {
   PKGCONFIG += x11
   target.path = $$LIB_DIR/qmmp/General
   INSTALLS += target
 }
-
-HEADERS += notifierfactory.h \
- notifier.h \
- popupwidget.h \
- settingsdialog.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
-SOURCES += notifierfactory.cpp \
- notifier.cpp \
- popupwidget.cpp \
- settingsdialog.cpp
-
-FORMS += settingsdialog.ui
-
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index dc26945b2..8929efd16 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -1,16 +1,7 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/rgscan
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/librgscan.so
+TARGET = $$PLUGINS_PREFIX/General/rgscan
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
-unix{
-  PKGCONFIG += taglib
-  target.path = $$LIB_DIR/qmmp/General
-  INSTALLS += target
-}
 HEADERS += rgscanfactory.h \
     rgscanhelper.h \
     rgscandialog.h \
@@ -24,3 +15,13 @@ SOURCES += rgscanfactory.cpp \
     rgscanner.cpp
 
 FORMS += rgscandialog.ui
+
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
+
+unix {
+    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 bab0e0a82..5d456e327 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -1,13 +1,9 @@
 include(../../plugins.pri)
 
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so
 
-RESOURCES = translations/translations.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
+QT += network
+
 HEADERS += scrobblerfactory.h \
     settingsdialog.h \
     scrobblerhandler.h \
@@ -23,19 +19,11 @@ SOURCES += scrobblerfactory.cpp \
 
 FORMS += settingsdialog.ui
 
-QT += network
+RESOURCES = translations/translations.qrc
 
 LIBS += -lqmmpui
 
-
-
-
-
-
-
-
-
-
-
-
-
+unix {
+    target.path = $$LIB_DIR/qmmp/General
+    INSTALLS += target
+}
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 49e9c8d83..0665c61a8 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -1,23 +1,14 @@
 include(../../plugins.pri)
 
 unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so
-win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
-RESOURCES += images/tray_images.qrc
 HEADERS += statusiconfactory.h \
     statusicon.h \
     settingsdialog.h \
     qmmptrayicon.h \
     statusiconpopupwidget.h \
     coverwidget.h
+
 SOURCES += statusiconfactory.cpp \
     statusicon.cpp \
     settingsdialog.cpp \
@@ -27,3 +18,12 @@ SOURCES += statusiconfactory.cpp \
 
 FORMS += settingsdialog.ui
 
+RESOURCES = translations/translations.qrc \
+            images/tray_images.qrc
+
+LIBS += -lqmmpui
+
+unix {
+    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 049db03a8..aea60f832 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -1,25 +1,24 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/streambrowser
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstreambrowser.so
+TARGET = $$PLUGINS_PREFIX/General/streambrowser
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
+QT += network
 
-unix {
-  target.path = $$LIB_DIR/qmmp/General
-  INSTALLS += target
-}
 HEADERS += streambrowserfactory.h \
            streambrowser.h \
            streamwindow.h
-win32:HEADERS += ../../../../src/qmmpui/general.h
+
 SOURCES += streambrowserfactory.cpp \
            streambrowser.cpp \
            streamwindow.cpp
 
 FORMS += streamwindow.ui
 
-QT += network
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
 
+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 cc76d713b..a709b8a1a 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -1,15 +1,7 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/General/trackchange
-unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so
+TARGET = $$PLUGINS_PREFIX/General/trackchange
 
-LIBS += -lqmmpui
-
-RESOURCES = translations/translations.qrc
-unix {
-    target.path = $$LIB_DIR/qmmp/General
-    INSTALLS += target
-}
 HEADERS += trackchangefactory.h \
            trackchange.h \
            settingsdialog.h
@@ -19,3 +11,12 @@ SOURCES += trackchangefactory.cpp \
            settingsdialog.cpp
 
 FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
+LIBS += -lqmmpui
+
+unix {
+    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 388926ff0..905a10629 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -1,15 +1,8 @@
 include(../../plugins.pri)
 
-QT += dbus
-
 TARGET = $$PLUGINS_PREFIX/General/udisks
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so
-
-RESOURCES = translations/translations.qrc
-
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
 
+QT += dbus
 
 HEADERS += udisksfactory.h \
            udisksplugin.h \
@@ -23,6 +16,11 @@ SOURCES += udisksfactory.cpp \
            udisksdevice.cpp \
            settingsdialog.cpp
 
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
 LIBS += -lqmmpui
 
-FORMS += settingsdialog.ui
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 193af114f..2034bd925 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -1,15 +1,8 @@
 include(../../plugins.pri)
 
-QT += dbus
-
 TARGET = $$PLUGINS_PREFIX/General/udisks2
-QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so
-
-RESOURCES = translations/translations.qrc
-
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
 
+QT += dbus
 
 HEADERS += udisks2factory.h \
            udisks2plugin.h \
@@ -23,6 +16,11 @@ SOURCES += udisks2factory.cpp \
            udisks2device.cpp \
            settingsdialog.cpp
 
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
 LIBS += -lqmmpui
 
-FORMS += settingsdialog.ui
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index 48c3592bb..cb61768b3 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/aac
+
 HEADERS += decoderaacfactory.h \
     decoder_aac.h \
     aacfile.h \
@@ -8,13 +10,13 @@ SOURCES += decoder_aac.cpp \
     decoderaacfactory.cpp \
     aacfile.cpp \
     aacmetadatamodel.cpp
-TARGET = $$PLUGINS_PREFIX/Input/aac
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libaac.so
+
+RESOURCES = translations/translations.qrc
+
 LIBS += -lfaad \
     -L/usr/lib \
     -I/usr/include
 PKGCONFIG += taglib
 
-RESOURCES = translations/translations.qrc
 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 5de6744fc..0659c072e 100644
--- a/src/plugins/Input/archive/archive.pro
+++ b/src/plugins/Input/archive/archive.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Input/archive
+
 HEADERS += \
     archiveinputdevice.h \
     decoderarchivefactory.h \
@@ -14,16 +16,10 @@ SOURCES += \
     archivetagreader.cpp \
     archivemetadatamodel.cpp
 
-TARGET=$$PLUGINS_PREFIX/Input/archive
-
-LIBS += -lqmmp
-
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
     PKGCONFIG += libarchive taglib
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libarc.so
 }
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index d8e123a4c..5b53fe8b4 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -1,25 +1,25 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Input/cdaudio
+
 HEADERS += decodercdaudiofactory.h \
            decoder_cdaudio.h \
            settingsdialog.h
+
 SOURCES += decoder_cdaudio.cpp \
            decodercdaudiofactory.cpp \
            settingsdialog.cpp
 
-TARGET =$$PLUGINS_PREFIX/Input/cdaudio
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-FORMS += settingsdialog.ui
-
 LIBS += -lqmmp
 
 unix {
   LIBS += -L/usr/lib  -I/usr/include
   PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb
   target.path = $$LIB_DIR/qmmp/Input
-  QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcdaudio.so
   INSTALLS += target
 }
 
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index 21c0c366f..d97965f30 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -1,26 +1,28 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/cue
+
 HEADERS += decodercuefactory.h \
     cueparser.h \
     decoder_cue.h \
     settingsdialog.h \
     cuemetadatamodel.h
+
 SOURCES += decoder_cue.cpp \
     decodercuefactory.cpp \
     cueparser.cpp \
     settingsdialog.cpp \
     cuemetadatamodel.cpp
 
-TARGET = $$PLUGINS_PREFIX/Input/cue
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libcue.so
-
-contains(CONFIG, WITH_ENCA){
-   DEFINES += WITH_ENCA
-   unix:PKGCONFIG += enca
-   win32:LIBS += -lenca.dll
-}
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
+
+contains(CONFIG, WITH_ENCA) {
+    DEFINES += WITH_ENCA
+    unix:PKGCONFIG += enca
+    win32:LIBS += -lenca.dll
+}
 unix {
     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 a6a5b8801..aa3b57a34 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -1,32 +1,33 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/ffmpeg
+
 HEADERS += decoderffmpegfactory.h \
     decoder_ffmpeg.h \
     settingsdialog.h \
     ffmpegmetadatamodel.h \
     replaygainreader.h
+
 SOURCES += decoder_ffmpeg.cpp \
     decoderffmpegfactory.cpp \
     settingsdialog.cpp \
     ffmpegmetadatamodel.cpp \
     replaygainreader.cpp
 
-TARGET = $$PLUGINS_PREFIX/Input/ffmpeg
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
+DEFINES += __STDC_CONSTANT_MACROS
 
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
-
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
     LIBS += -lavcodec.dll -lavformat.dll -lavutil.dll
 }
-
-DEFINES += __STDC_CONSTANT_MACROS
-
-RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
index bfcc5bf8e..280dd1246 100644
--- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
+++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
@@ -1,30 +1,29 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy
+
 HEADERS += decoderffmpegfactory.h \
     decoder_ffmpeg.h \
     settingsdialog.h \
     ffmpegmetadatamodel.h
+
 SOURCES += decoder_ffmpeg.cpp \
     decoderffmpegfactory.cpp \
     settingsdialog.cpp \
     ffmpegmetadatamodel.cpp
 
+FORMS += settingsdialog.ui
 
-TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy
+RESOURCES = translations/translations.qrc
+
+DEFINES += __STDC_CONSTANT_MACROS
 
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg_legacy.so
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
-
 win32 {
     LIBS +=-lavcodec.dll -lavformat.dll -lavutil.dll
 }
-
-DEFINES += __STDC_CONSTANT_MACROS
-
-RESOURCES = translations/translations.qrc
-
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 8c9ae70cc..e5915ff09 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -1,16 +1,18 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/flac
+
 HEADERS += decoderflacfactory.h \
     decoder_flac.h \
     cueparser.h \
     flacmetadatamodel.h \
     replaygainreader.h
+
 SOURCES += decoder_flac.cpp \
     decoderflacfactory.cpp \
     cueparser.cpp \
     flacmetadatamodel.cpp \
     replaygainreader.cpp
-TARGET = $$PLUGINS_PREFIX/Input/flac
 
 RESOURCES = translations/translations.qrc
 
@@ -20,8 +22,6 @@ unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += taglib flac
-
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libflac.so
 }
 
 win32 {
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index 73fe7c1fd..e639a13ef 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -1,9 +1,12 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Input/gme
+
 HEADERS += decodergmefactory.h \
     decoder_gme.h \
     gmehelper.h \
     settingsdialog.h
+
 SOURCES += decoder_gme.cpp \
     decodergmefactory.cpp \
     gmehelper.cpp \
@@ -11,13 +14,8 @@ SOURCES += decoder_gme.cpp \
 
 FORMS += settingsdialog.ui
 
-TARGET = $$PLUGINS_PREFIX/Input/gme
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libgme.so
-
 RESOURCES = translations/translations.qrc
 
-LIBS += -lqmmp
-
 unix{
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index 1e225bc91..3766d2432 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -1,27 +1,30 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/mad
+
 HEADERS += decodermadfactory.h \
     decoder_mad.h \
     settingsdialog.h \
     tagextractor.h \
     mpegmetadatamodel.h \
     replaygainreader.h
+
 SOURCES += decoder_mad.cpp \
     decodermadfactory.cpp \
     settingsdialog.cpp \
     tagextractor.cpp \
     mpegmetadatamodel.cpp \
     replaygainreader.cpp
-TARGET = $$PLUGINS_PREFIX/Input/mad
+
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
+
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
     LIBS += -lmad
     PKGCONFIG += taglib mad
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmad.so
 }
 
 win32 {
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index dacb4643f..2ad23a20a 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -1,27 +1,30 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/modplug
+
 HEADERS += decodermodplugfactory.h \
     decoder_modplug.h \
     settingsdialog.h \
     archivereader.h \
     modplugmetadatamodel.h
+
 SOURCES += decoder_modplug.cpp \
     decodermodplugfactory.cpp \
     settingsdialog.cpp \
     archivereader.cpp \
     modplugmetadatamodel.cpp
-TARGET = $$PLUGINS_PREFIX/Input/modplug
 
-DEFINES += HAVE_STDINT_H \
-    HAVE_INTTYPES_H
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
+DEFINES += HAVE_STDINT_H \
+    HAVE_INTTYPES_H
+
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += libmodplug
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmodplug.so
 }
 
 win32 {
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index 04f6cb09a..1f21e7222 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -1,27 +1,27 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/mpc
+
 HEADERS += decodermpcfactory.h \
     decoder_mpc.h \
     mpcmetadatamodel.h
+
 SOURCES += decoder_mpc.cpp \
     decodermpcfactory.cpp \
     mpcmetadatamodel.cpp
-TARGET = $$PLUGINS_PREFIX/Input/mpc
+
 
 RESOURCES = translations/translations.qrc
+
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
     PKGCONFIG += taglib
     LIBS += -lmpcdec  -I/usr/include
     exists(/usr/include/mpcdec/mpcdec.h):DEFINES += MPC_OLD_API
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmpc.so
 }
 
 win32 {
-    HEADERS += ../../../../src/qmmp/metadatamodel.h \
-               ../../../../src/qmmp/decoderfactory.h
     LIBS += -lmpcdec -ltag.dll
     #DEFINES += MPC_OLD_API
 }
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index 4d83a393d..f55764ca3 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/opus
+
 HEADERS += decoderopusfactory.h \
     decoder_opus.h \
     opusmetadatamodel.h \
@@ -7,6 +9,7 @@ HEADERS += decoderopusfactory.h \
     opusproperties.h \
     opusfile.h \
     tdebug.h
+
 SOURCES += decoder_opus.cpp \
     decoderopusfactory.cpp \
     opusmetadatamodel.cpp \
@@ -14,7 +17,6 @@ SOURCES += decoder_opus.cpp \
     opusproperties.cpp \
     opusfile.cpp \
     tdebug.cpp
-TARGET = $$PLUGINS_PREFIX/Input/opus
 
 
 RESOURCES = translations/translations.qrc
@@ -22,9 +24,7 @@ RESOURCES = translations/translations.qrc
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
     PKGCONFIG += taglib opus opusfile
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libopus.so
 }
 
 win32 {
diff --git a/src/plugins/Input/sid/sid.pro b/src/plugins/Input/sid/sid.pro
index 290633d80..49402f136 100644
--- a/src/plugins/Input/sid/sid.pro
+++ b/src/plugins/Input/sid/sid.pro
@@ -1,22 +1,21 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Input/sid
+
 HEADERS += decodersidfactory.h \
     decoder_sid.h \
     sidhelper.h \
     settingsdialog.h
+
 SOURCES += decoder_sid.cpp \
     decodersidfactory.cpp \
     sidhelper.cpp \
     settingsdialog.cpp
-FORMS += \
-    settingsdialog.ui
-
-
-TARGET = $$PLUGINS_PREFIX/Input/sid
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libsid.so
 
 RESOURCES = translations/translations.qrc
 
+FORMS += settingsdialog.ui
+
 unix{
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index b2b06b90b..389fbc21c 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -1,19 +1,19 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Input/sndfile
+
 HEADERS += decodersndfilefactory.h \
            decoder_sndfile.h
+
 SOURCES += decoder_sndfile.cpp \
            decodersndfilefactory.cpp
 
-TARGET=$$PLUGINS_PREFIX/Input/sndfile
-
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += sndfile
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libsndfile.so
 }
 
 win32 {
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index e0c47ff38..70711fa4c 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -1,23 +1,23 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/vorbis
+
 HEADERS += decodervorbisfactory.h \
     decoder_vorbis.h \
     vorbismetadatamodel.h \
     replaygainreader.h
+
 SOURCES += decoder_vorbis.cpp \
     decodervorbisfactory.cpp \
     vorbismetadatamodel.cpp \
     replaygainreader.cpp
-TARGET = $$PLUGINS_PREFIX/Input/vorbis
 
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
     PKGCONFIG += taglib ogg vorbisfile vorbis
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libvorbis.so
 }
 
 win32 {
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index 1490a9c8c..c55d21148 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -1,16 +1,19 @@
 include(../../plugins.pri)
-FORMS +=
+
+TARGET = $$PLUGINS_PREFIX/Input/wavpack
+
 HEADERS += decoderwavpackfactory.h \
     decoder_wavpack.h \
     cueparser.h \
     wavpackmetadatamodel.h \
     replaygainreader.h
+
 SOURCES += decoder_wavpack.cpp \
     decoderwavpackfactory.cpp \
     cueparser.cpp \
     wavpackmetadatamodel.cpp \
     replaygainreader.cpp
-TARGET = $$PLUGINS_PREFIX/Input/wavpack
+
 
 RESOURCES = translations/translations.qrc
 
@@ -18,11 +21,8 @@ unix {
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += wavpack
-    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwavpack.so
 }
 
 win32 {
-    HEADERS += ../../../../src/qmmp/metadatamodel.h \
-               ../../../../src/qmmp/decoderfactory.h
     LIBS += -lwavpack
 }
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index fb0b78828..073baf5da 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -1,20 +1,24 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Input/wildmidi
+
 HEADERS += decoderwildmidifactory.h \
     decoder_wildmidi.h \
     wildmidihelper.h \
     settingsdialog.h
+
 SOURCES += decoder_wildmidi.cpp \
     decoderwildmidifactory.cpp \
     wildmidihelper.cpp \
     settingsdialog.cpp
-TARGET = $$PLUGINS_PREFIX/Input/wildmidi
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwildmidi.so
+
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
 
 LIBS += -L/usr/lib \
     -I/usr/include \
     -lWildMidi
 
-RESOURCES = translations/translations.qrc
 target.path = $$LIB_DIR/qmmp/Input
 INSTALLS += target
diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro
index c3a1812dd..5e5b01322 100644
--- a/src/plugins/Output/alsa/alsa.pro
+++ b/src/plugins/Output/alsa/alsa.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/alsa
+
 HEADERS += outputalsa.h \
            outputalsafactory.h  \
            settingsdialog.h
@@ -7,14 +9,11 @@ SOURCES += outputalsa.cpp \
            outputalsafactory.cpp  \
            settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/alsa
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libalsa.so
-
-PKGCONFIG += alsa
-
 FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
+PKGCONFIG += alsa
+
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/directsound/directsound.pro b/src/plugins/Output/directsound/directsound.pro
index 68febb16a..3c2c9843c 100644
--- a/src/plugins/Output/directsound/directsound.pro
+++ b/src/plugins/Output/directsound/directsound.pro
@@ -1,18 +1,16 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/directsound
+
 HEADERS += outputdirectsoundfactory.h \
            outputdirectsound.h
 
 SOURCES += outputdirectsoundfactory.cpp \
            outputdirectsound.cpp
 
-HEADERS += ../../../../src/qmmp/output.h
-
-TARGET=$$PLUGINS_PREFIX/Output/directsound
+RESOURCES = translations/translations.qrc
 
 LIBS += -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound -lksuser
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro
index f6648c391..235b052b7 100644
--- a/src/plugins/Output/jack/jack.pro
+++ b/src/plugins/Output/jack/jack.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/jack
+
 HEADERS += outputjackfactory.h \
            outputjack.h \
            bio2jack.h
@@ -8,8 +10,7 @@ SOURCES += outputjackfactory.cpp \
            outputjack.cpp \
            bio2jack.c
 
-TARGET=$$PLUGINS_PREFIX/Output/jack
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libjack.so
+RESOURCES = translations/translations.qrc
 
 contains(CONFIG, WITH_NEW_JACK){
     DEFINES += JACK_NEW_API
@@ -17,7 +18,5 @@ contains(CONFIG, WITH_NEW_JACK){
 
 PKGCONFIG += jack soxr
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro
index 3c4141f4d..bd4e424a6 100644
--- a/src/plugins/Output/null/null.pro
+++ b/src/plugins/Output/null/null.pro
@@ -1,18 +1,16 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/null
+
 HEADERS += outputnullfactory.h \
            outputnull.h
 
 SOURCES += outputnullfactory.cpp \
            outputnull.cpp
 
-
-TARGET=$$PLUGINS_PREFIX/Output/null
-
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libnull.so
 }
diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro
index 12ab8d226..d497d6207 100644
--- a/src/plugins/Output/oss/oss.pro
+++ b/src/plugins/Output/oss/oss.pro
@@ -1,4 +1,7 @@
 include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/Output/oss
+
 FORMS += settingsdialog.ui
 
 HEADERS += outputossfactory.h \
@@ -9,12 +12,9 @@ SOURCES += outputossfactory.cpp \
            outputoss.cpp \
            settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/oss
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss.so
+RESOURCES = translations/translations.qrc
 
 DEFINES += HAVE_SYS_SOUNDCARD_H
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/oss4/oss4.pro b/src/plugins/Output/oss4/oss4.pro
index 81a83b48c..26076e918 100644
--- a/src/plugins/Output/oss4/oss4.pro
+++ b/src/plugins/Output/oss4/oss4.pro
@@ -1,21 +1,20 @@
 include(../../plugins.pri)
-FORMS += settingsdialog.ui
+
+TARGET = $$PLUGINS_PREFIX/Output/oss4
 
 HEADERS += outputoss4factory.h \
            outputoss4.h \
            settingsdialog.h
 
-
 SOURCES += outputoss4factory.cpp \
            outputoss4.cpp \
            settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/oss4
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss4.so
-
-DEFINES += HAVE_SYS_SOUNDCARD_H
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
+DEFINES += HAVE_SYS_SOUNDCARD_H
+
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/pulseaudio/pulseaudio.pro b/src/plugins/Output/pulseaudio/pulseaudio.pro
index c60e4d1a9..1487fb347 100644
--- a/src/plugins/Output/pulseaudio/pulseaudio.pro
+++ b/src/plugins/Output/pulseaudio/pulseaudio.pro
@@ -1,18 +1,16 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/pulseaudio
+
 HEADERS += outputpulseaudiofactory.h \
            outputpulseaudio.h
 
 SOURCES += outputpulseaudiofactory.cpp \
            outputpulseaudio.cpp
 
-
-TARGET=$$PLUGINS_PREFIX/Output/pulseaudio
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libpulseaudio.so
+RESOURCES = translations/translations.qrc
 
 PKGCONFIG += libpulse-simple
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/qtmultimedia/qtmultimedia.pro b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
index 40ab13f33..f5afd0e58 100644
--- a/src/plugins/Output/qtmultimedia/qtmultimedia.pro
+++ b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/qtmultimedia
+
 QT += multimedia
 
 FORMS += settingsdialog.ui
@@ -12,13 +14,9 @@ SOURCES += outputqtmultimediafactory.cpp \
            outputqtmultimedia.cpp \
            settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/qtmultimedia
-
-
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libqtmultimedia.so
 }
diff --git a/src/plugins/Output/shout/shout.pro b/src/plugins/Output/shout/shout.pro
index fc7706366..939f5ad3f 100644
--- a/src/plugins/Output/shout/shout.pro
+++ b/src/plugins/Output/shout/shout.pro
@@ -1,5 +1,7 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/shout
+
 HEADERS += outputshoutfactory.h \
     shoutoutput.h \
     shoutclient.h \
@@ -10,17 +12,13 @@ SOURCES += outputshoutfactory.cpp \
     shoutclient.cpp \
     settingsdialog.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/shout
-
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
 unix {
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libshout.so
     PKGCONFIG += ogg vorbis vorbisenc shout soxr
 }
 
-FORMS += \
-    settingsdialog.ui
diff --git a/src/plugins/Output/wasapi/wasapi.pro b/src/plugins/Output/wasapi/wasapi.pro
index b1f681f36..014bb4851 100644
--- a/src/plugins/Output/wasapi/wasapi.pro
+++ b/src/plugins/Output/wasapi/wasapi.pro
@@ -1,18 +1,16 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/wasapi
+
 HEADERS += outputwasapifactory.h \
            outputwasapi.h
 
 SOURCES += outputwasapifactory.cpp \
            outputwasapi.cpp
 
-HEADERS += ../../../../src/qmmp/output.h
-
-TARGET=$$PLUGINS_PREFIX/Output/wasapi
+RESOURCES = translations/translations.qrc
 
 LIBS += -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/waveout/waveout.pro b/src/plugins/Output/waveout/waveout.pro
index e15b28249..86485d90b 100644
--- a/src/plugins/Output/waveout/waveout.pro
+++ b/src/plugins/Output/waveout/waveout.pro
@@ -1,16 +1,16 @@
 include(../../plugins.pri)
 
+TARGET = $$PLUGINS_PREFIX/Output/waveout
+
 HEADERS += outputwaveoutfactory.h \
            outputwaveout.h
 
 SOURCES += outputwaveoutfactory.cpp \
            outputwaveout.cpp
 
-TARGET=$$PLUGINS_PREFIX/Output/waveout
+RESOURCES = translations/translations.qrc
 
 LIBS += -lwinmm
 
-RESOURCES = translations/translations.qrc
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index 7761d284d..f70f38b60 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -1,6 +1,6 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat
+TARGET = $$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat
 
 HEADERS += m3uplaylistformat.h
 
@@ -11,5 +11,4 @@ LIBS += -lqmmpui
 unix {
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libm3uplaylistformat.so
 }
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index 22bf9beae..736a20994 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -1,6 +1,6 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat
+TARGET = $$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat
 
 SOURCES += plsplaylistformat.cpp
 
@@ -11,5 +11,4 @@ LIBS += -lqmmpui
 unix {
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat.so
 }
diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro
index 42d1da5a6..c0e45b516 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -1,8 +1,9 @@
 include(../../plugins.pri)
 
-TARGET =$$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat
+TARGET = $$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat
 
 SOURCES += xspfplaylistformat.cpp
+
 HEADERS += xspfplaylistformat.h
 
 LIBS += -lqmmpui
@@ -10,7 +11,4 @@ LIBS += -lqmmpui
 unix {
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
-
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libxsplaylistformat.so
-
 }
diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro
index 75404ae80..10d47d16f 100644
--- a/src/plugins/Transports/http/http.pro
+++ b/src/plugins/Transports/http/http.pro
@@ -1,17 +1,28 @@
 include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/Transports/http
+
 HEADERS += \
     httpinputfactory.h \
     httpinputsource.h \
     settingsdialog.h \
     httpstreamreader.h
+
 SOURCES += \
     httpinputfactory.cpp \
     httpinputsource.cpp \
     settingsdialog.cpp \
     httpstreamreader.cpp
 
-TARGET = $$PLUGINS_PREFIX/Transports/http
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libhttp.so
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
+contains(CONFIG, WITH_ENCA){
+   DEFINES += WITH_ENCA
+   unix:PKGCONFIG += enca
+   win32:LIBS += -lenca.dll
+}
 
 unix {
     LIBS += -L/usr/lib
@@ -23,13 +34,4 @@ win32 {
     LIBS += -lcurldll
 }
 
-contains(CONFIG, WITH_ENCA){
-   DEFINES += WITH_ENCA
-   unix:PKGCONFIG += enca
-   win32:LIBS += -lenca.dll
 
-}
-
-FORMS += settingsdialog.ui
-
-RESOURCES = translations/translations.qrc
diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro
index 43cd1121c..56a800e09 100644
--- a/src/plugins/Transports/mms/mms.pro
+++ b/src/plugins/Transports/mms/mms.pro
@@ -1,25 +1,27 @@
 include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/Transports/mms
+
 HEADERS += \
     mmsinputfactory.h \
     mmsinputsource.h \
     settingsdialog.h \
     mmsstreamreader.h
+
 SOURCES += \
     mmsinputfactory.cpp \
     mmsinputsource.cpp \
     settingsdialog.cpp \
     mmsstreamreader.cpp
 
-TARGET = $$PLUGINS_PREFIX/Transports/mms
-unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmms.so
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
 
 LIBS += -lqmmp -L/usr/lib
 PKGCONFIG += libmms
+
 target.path = $$LIB_DIR/qmmp/Transports
 INSTALLS += target
 
-FORMS += settingsdialog.ui
-
-RESOURCES = translations/translations.qrc
-
 QMAKE_CFLAGS_ISYSTEM='' #removes "-isystem /usr/include"  provided by libmms.pc
diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro
index e3b494979..5e2f8dce9 100644
--- a/src/plugins/Ui/qsui/qsui.pro
+++ b/src/plugins/Ui/qsui/qsui.pro
@@ -79,11 +79,11 @@ RESOURCES += translations/translations.qrc resources/qsui_resources.qrc txt/qsui
 
 LIBS += -lqmmpui
 
-unix{
+unix {
   target.path = $$LIB_DIR/qmmp/Ui
   INSTALLS += target
 }
 
-win32{
+win32 {
   INCLUDEPATH += ./
 }
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index dc03fa8f6..3d983f34a 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -1,11 +1,7 @@
 include(../../plugins.pri)
-FORMS += \
-    forms/preseteditor.ui \
-    forms/playlistbrowser.ui \
-    forms/popupsettings.ui \
-    forms/shortcutdialog.ui \
-    forms/skinnedsettings.ui \
-    forms/hotkeyeditor.ui
+
+TARGET = $$PLUGINS_PREFIX/Ui/skinned
+
 HEADERS += mainwindow.h \
     button.h \
     display.h \
@@ -58,6 +54,7 @@ HEADERS += mainwindow.h \
     listwidgetdrawer.h \
     playlistheader.h \
     horizontalslider.h
+
 SOURCES += mainwindow.cpp \
     button.cpp \
     display.cpp \
@@ -110,16 +107,22 @@ SOURCES += mainwindow.cpp \
     playlistheader.cpp \
     horizontalslider.cpp
 
-LIBS += -lqmmpui
+FORMS += \
+    forms/preseteditor.ui \
+    forms/playlistbrowser.ui \
+    forms/popupsettings.ui \
+    forms/shortcutdialog.ui \
+    forms/skinnedsettings.ui \
+    forms/hotkeyeditor.ui
 
-TARGET = $$PLUGINS_PREFIX/Ui/skinned
+RESOURCES = resources/resources.qrc \
+            glare/glare.qrc \
+            translations/translations.qrc
 
-RESOURCES = resources/resources.qrc glare/glare.qrc
+LIBS += -lqmmpui
 
 unix {
- target.path = $$LIB_DIR/qmmp/Ui
- INSTALLS += target
- PKGCONFIG += x11
+   target.path = $$LIB_DIR/qmmp/Ui
+   INSTALLS += target
+   PKGCONFIG += x11
 }
-
-RESOURCES += translations/translations.qrc
diff --git a/src/plugins/Visual/analyzer/analyzer.pro b/src/plugins/Visual/analyzer/analyzer.pro
index a1b1e0d18..b1338088e 100644
--- a/src/plugins/Visual/analyzer/analyzer.pro
+++ b/src/plugins/Visual/analyzer/analyzer.pro
@@ -1,10 +1,7 @@
 include(../../plugins.pri)
 
-TARGET=$$PLUGINS_PREFIX/Visual/analyzer
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libanalyzer.so
+TARGET = $$PLUGINS_PREFIX/Visual/analyzer
 
-
-FORMS += settingsdialog.ui
 HEADERS += analyzer.h \
            fft.h \
            visualanalyzerfactory.h \
@@ -17,24 +14,11 @@ SOURCES += analyzer.cpp \
            colorwidget.cpp \
            settingsdialog.cpp
 
-TRANSLATIONS = translations/analyzer_plugin_cs.ts \
-               translations/analyzer_plugin_de.ts \
-               translations/analyzer_plugin_zh_CN.ts \
-               translations/analyzer_plugin_zh_TW.ts \
-               translations/analyzer_plugin_ru.ts \
-               translations/analyzer_plugin_pl.ts \
-               translations/analyzer_plugin_uk_UA.ts \
-               translations/analyzer_plugin_it.ts \
-               translations/analyzer_plugin_tr.ts \
-               translations/analyzer_plugin_lt.ts \
-               translations/analyzer_plugin_nl.ts \
-               translations/analyzer_plugin_ja.ts \
-               translations/analyzer_plugin_es.ts \
-               translations/analyzer_plugin_sr_BA.ts \
-               translations/analyzer_plugin_sr_RS.ts
+FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
+
 unix{
- target.path = $$LIB_DIR/qmmp/Visual
- INSTALLS += target
+   target.path = $$LIB_DIR/qmmp/Visual
+   INSTALLS += target
 }
diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro
index 31755afd7..59af466cc 100644
--- a/src/plugins/Visual/projectm/projectm.pro
+++ b/src/plugins/Visual/projectm/projectm.pro
@@ -1,11 +1,8 @@
 include(../../plugins.pri)
 
-contains(CONFIG, WITH_PROJECTM20){
-  DEFINES += PROJECTM_20
-}
+TARGET = $$PLUGINS_PREFIX/Visual/projectm
 
-TARGET =$$PLUGINS_PREFIX/Visual/projectm
-QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libprojectm.so
+QT += opengl
 
 HEADERS += projectmwidget.h \
            visualprojectmfactory.h \
@@ -16,39 +13,26 @@ SOURCES += projectmplugin.cpp \
            projectmwidget.cpp \
            projectmwrapper.cpp
 
-QT += opengl
-
-TRANSLATIONS = translations/projectm_plugin_cs.ts \
-               translations/projectm_plugin_de.ts \
-               translations/projectm_plugin_zh_CN.ts \
-               translations/projectm_plugin_zh_TW.ts \
-               translations/projectm_plugin_pl.ts \
-               translations/projectm_plugin_ru.ts \
-               translations/projectm_plugin_uk_UA.ts \
-               translations/projectm_plugin_it.ts \
-               translations/projectm_plugin_tr.ts \
-               translations/projectm_plugin_lt.ts \
-               translations/projectm_plugin_nl.ts \
-               translations/projectm_plugin_ja.ts \
-               translations/projectm_plugin_es.ts \
-               translations/projectm_plugin_sr_BA.ts \
-               translations/projectm_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
+contains(CONFIG, WITH_PROJECTM20){
+    DEFINES += PROJECTM_20
+}
+
 unix {
-  PKGCONFIG += libprojectM
-  target.path = $$LIB_DIR/qmmp/Visual
-  INSTALLS += target
-  LIBS += -L/usr/lib -I/usr/include
-  #projectM config path
-  PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-                          /usr/local/share/projectM/config.inp
-  for(path, PROJECTM_CONFIG_FILES) {
-    exists($$path) {
-      message ("found projectm configuration: "$$path)
-      DEFINES += PROJECTM_CONFIG=\\\"$$path\\\"
+    PKGCONFIG += libprojectM
+    target.path = $$LIB_DIR/qmmp/Visual
+    INSTALLS += target
+    LIBS += -L/usr/lib -I/usr/include
+    #projectM config path
+    PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
+                            /usr/local/share/projectM/config.inp
+    for(path, PROJECTM_CONFIG_FILES) {
+         exists($$path) {
+            message ("found projectm configuration: "$$path)
+           DEFINES += PROJECTM_CONFIG=\\\"$$path\\\"
+        }
     }
-  }
 }
 
 win32 {