From 8c4abb3aec04e2b6b01a55cd1895e949f8c58135 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sat, 23 Aug 2008 22:22:32 +0000
Subject: [PATCH] added missing dependency to bin2res-target in order to build
 properly when using "make -jX"

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1481 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                       | 10 ++++++++++
 cmake/modules/BuildPlugin.cmake |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95cc16ec1..1cffcb98a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-23	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* cmake/modules/BuildPlugin.cmake:
+	added missing dependency to bin2res-target in order to build properly
+	when using "make -jX"
+
+	* CMakeLists.txt:
+	improved summary page (specific information on what to do if a certain
+	feature isn't enabled because something was missing)
+
 2008-08-23	Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* plugins/bit_invader/bit_invader.cpp:
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index 2f27c9e93..acba52592 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -60,11 +60,11 @@ MACRO(BUILD_PLUGIN)
 
 	LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN)
 	IF(ER_LEN)
-		SET(ER_H embedded_resources.h)
-
+		SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
 			COMMAND ${BIN2RES}
-			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H})
+			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}
+			DEPENDS ${BIN2RES})
 	ENDIF(ER_LEN)
 
 	QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
@@ -72,7 +72,6 @@ MACRO(BUILD_PLUGIN)
 	FOREACH(f ${PLUGIN_SOURCES})
 		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
 	ENDFOREACH(f)
-#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -i-static")
 
 	IF(LMMS_BUILD_APPLE)
 	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR})