11 files changed, 35 insertions, 50 deletions
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