From ff85d16aad8dbc9ae118aa81f4741bf46b1b53d5 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 22 Dec 2012 09:33:31 +0000
Subject: fixed build

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3086 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/PlayListFormats/PlayListFormats.pro | 6 ++++++
 src/plugins/PlayListFormats/PlaylistFormats.pro | 6 ------
 src/plugins/PlayListFormats/m3u/CMakeLists.txt  | 2 +-
 src/plugins/PlayListFormats/m3u/m3u.pro         | 2 +-
 src/plugins/PlayListFormats/pls/CMakeLists.txt  | 2 +-
 src/plugins/PlayListFormats/pls/pls.pro         | 4 ++--
 src/plugins/PlayListFormats/xspf/CMakeLists.txt | 2 +-
 src/plugins/PlayListFormats/xspf/xspf.pro       | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 src/plugins/PlayListFormats/PlayListFormats.pro
 delete mode 100644 src/plugins/PlayListFormats/PlaylistFormats.pro

(limited to 'src/plugins/PlayListFormats')

diff --git a/src/plugins/PlayListFormats/PlayListFormats.pro b/src/plugins/PlayListFormats/PlayListFormats.pro
new file mode 100644
index 000000000..f214cffff
--- /dev/null
+++ b/src/plugins/PlayListFormats/PlayListFormats.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+SUBDIRS += m3u pls xspf
+
+
+
diff --git a/src/plugins/PlayListFormats/PlaylistFormats.pro b/src/plugins/PlayListFormats/PlaylistFormats.pro
deleted file mode 100644
index f214cffff..000000000
--- a/src/plugins/PlayListFormats/PlaylistFormats.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += m3u pls xspf
-
-
-
diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
index f7a18fb07..cbed694fe 100644
--- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt
@@ -46,4 +46,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS} ${libm3uplaylistformat_MOC_SRCS})
 add_dependencies(m3uplaylistformat qmmpui)
 target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} -lqmmpui)
-install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats)
+install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index b4a435c7f..952165a9d 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -5,7 +5,7 @@ warn_on \
 plugin  \
  lib
 
-TARGET =$$PLUGINS_PREFIX/PlaylistFormats/m3uplaylistformat
+TARGET =$$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat
 
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt
index 29c49f73c..4e221e436 100644
--- a/src/plugins/PlayListFormats/pls/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt
@@ -46,4 +46,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS} ${libplsplaylistformat_MOC_SRCS})
 add_dependencies(plsplaylistformat qmmpui)
 target_link_libraries(plsplaylistformat ${QT_LIBRARIES} -lqmmpui)
-install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats)
+install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index 006e0aa63..60681f3ee 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -5,7 +5,7 @@ warn_on \
 plugin  \
  lib
 
-TARGET =$$PLUGINS_PREFIX/PlaylistFormats/plsplaylistformat
+TARGET =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat
 
 
 TEMPLATE = lib
@@ -24,7 +24,7 @@ unix {
     target.path = $$LIB_DIR/qmmp/PlaylistFormats
     INSTALLS += target
 
-    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlaylistFormats/plsplaylistformat.so
+    QMAKE_CLEAN =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat.so
     LIBS += -lqmmpui
 }
 
diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt
index f4a27ac22..b9ae8bd81 100644
--- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt
+++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt
@@ -51,4 +51,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS} ${libxspfplaylistformat_MOC_SRCS})
 add_dependencies(xspfplaylistformat qmmpui)
 target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui -lqmmp)
-install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlaylistFormats)
+install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats)
diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro
index 28a50ca44..e36b7d04c 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -5,7 +5,7 @@ warn_on \
 plugin  \
  lib
 
-TARGET =$$PLUGINS_PREFIX/PlaylistFormats/xspfplaylistformat
+TARGET =$$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat
 
 
 TEMPLATE = lib
-- 
cgit v1.2.3-13-gbd6f