fixed qmake support (patch by Ryota Shimamoto) (Fixes issue 586)

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

10 files changed, 29 insertions, 17 deletions

diff --git a/clear_qmake.cmd b/clear_qmake.cmd
index cdf8ecbd5..ff6838031 100644
--- a/clear_qmake.cmd
+++ b/clear_qmake.cmd
@@ -9,4 +9,6 @@ for /d /r %%B in (release)  do rmdir /s /q %%B
 for /r %%B in (*resource.rc)  do del /s /q %%B

 for /r %%B in (*.Debug)  do del /s /q %%B

 rmdir /s /q bin\plugins

+rmdir /s /q src\qmmp\pkgconfig

+rmdir /s /q src\qmmpui\pkgconfig

 del /s /q bin\qmmp.exe

diff --git a/clear_qmake.sh b/clear_qmake.sh
index b905b7232..6d5c062e2 100755
--- a/clear_qmake.sh
+++ b/clear_qmake.sh
@@ -8,3 +8,5 @@ make distclean
 rm -rf lib
 find . -type f -name *.qm -delete
 find . -type d -name ".build" | xargs rm -rf
+rm -rf src/qmmpui/pkgconfig
+rm -rf src/qmmp/pkgconfig
diff --git a/src/app/app.pro b/src/app/app.pro
index dfad34bd9..1c02f7f51 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -41,13 +41,14 @@ TEMPLATE = app
 unix {
     target.path = /bin
     desktop.files = qmmp.desktop \
-        qmmp_enqueue.desktop
+        qmmp_enqueue.desktop \
+        qmmp_dir.desktop
     desktop.path = /share/applications
     icon16.files = images/16x16/qmmp.png
     icon32.files = images/32x32/qmmp.png
     icon48.files = images/48x48/qmmp.png
-    icon_svg.files = images/scalable/qmmp.png \
-        images/scalable/qmmp.png
+    icon_svg.files = images/scalable/qmmp.svgz \
+        images/scalable/qmmp-simple.svgz
     icon16.path = /share/icons/hicolor/16x16/apps
     icon32.path = /share/icons/hicolor/32x32/apps
     icon48.path = /share/icons/hicolor/48x48/apps
diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 840a9c67c..6d70f2cf1 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -42,7 +42,7 @@ TRANSLATIONS = translations/kdenotify_plugin_cs.ts \
                translations/kdenotify_plugin_ja.ts \
                translations/kdenotify_plugin_es.ts
 
-images.files = app_icon.png \
-               empty_cover.png
+images.files = images/app_icon.png \
+               images/empty_cover.png
 images.path = /share/qmmp/images/
 INSTALLS += images
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index 63a6566af..b275eaa7d 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -19,10 +19,10 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libm3uplaylistformat.so
+    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libm3uplaylistformat.so
     LIBS += -lqmmpui
 }
 
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index b3e723d64..553220d37 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -20,7 +20,7 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    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 01c2eecfa..a7ca309b5 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -21,10 +21,10 @@ unix {
     isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
-    target.path = $$LIB_DIR/qmmp/PlaylistFormats
+    target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlaylistFormats/libxsplaylistformat.so
+    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/libxsplaylistformat.so
     LIBS += -lqmmpui -lqmmp
 }
 
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 5c7a674a0..27608e92c 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -1,3 +1,4 @@
 include(../../qmmp.pri)
 unix:PLUGINS_PREFIX=../../../../lib/qmmp
 win32:PLUGINS_PREFIX=../../../../../bin/plugins
+INCLUDEPATH += ../../../qmmp
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index ee1188005..b512c1177 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -72,6 +72,7 @@ unix:TARGET = ../../lib/qmmp
 win32:TARGET = ../../../bin/qmmp
 CONFIG += shared \
     warn_on \
+    create_pc create_prl no_install_prl \
     qt \
     thread
 TEMPLATE = lib
@@ -122,12 +123,11 @@ unix {
 INCLUDEPATH += ./
 
 
-
-
-
-
-
-
+QMAKE_PKGCONFIG_NAME = qmmp
+QMAKE_PKGCONFIG_DESCRIPTION = qmmp core library
+QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
 
 
 
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index 0ae9e0843..9dff9ba20 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -3,6 +3,7 @@ unix:TARGET = ../../lib/qmmpui
 win32:TARGET = ../../../bin/qmmpui
 CONFIG += warn_on \
     shared \
+    create_pc create_prl no_install_prl \
     qt \
     thread
 QMAKE_LIBDIR += ../../lib \
@@ -123,8 +124,13 @@ unix {
                    uifactory.h \
                    uihelper.h \
                    uiloader.h
-                   
+
     devel.path = /include/qmmpui
     INSTALLS += target \
         devel
 }
+
+QMAKE_PKGCONFIG_NAME = qmmpui
+QMAKE_PKGCONFIG_DESCRIPTION = qmmp user interface library
+QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui qmmp
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig