cmake remove circular linking and reorganize

- px4_add_module now requires MAIN
 - px4_add_library doesn't automatically link

src/lib/controllib/CMakeLists.txt

@@ -30,21 +30,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE lib__controllib
-	COMPILE_FLAGS
-	SRCS
-		block/Block.cpp
-		block/BlockParam.cpp
-		BlockDerivative.cpp
-		BlockHighPass.cpp
-		BlockIntegral.cpp
-		BlockIntegralTrap.cpp
-		BlockLimit.cpp
-		BlockLimitSym.cpp
-		BlockLowPass.cpp
-		BlockLowPass2.cpp
-	DEPENDS
-		platforms__common
-	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+
+px4_add_library(controllib
+	block/Block.cpp
+	block/BlockParam.cpp
+	BlockDerivative.cpp
+	BlockHighPass.cpp
+	BlockIntegral.cpp
+	BlockIntegralTrap.cpp
+	BlockLimit.cpp
+	BlockLimitSym.cpp
+	BlockLowPass.cpp
+	BlockLowPass2.cpp
+)

src/lib/controllib/block/BlockParam.hpp

@@ -43,7 +43,7 @@
 
 #include <containers/List.hpp>
 #include <px4_defines.h>
-#include <systemlib/param/param.h>
+#include <parameters/param.h>
 
 namespace control
 {

src/lib/controllib/controllib_test/CMakeLists.txt

@@ -37,7 +37,6 @@ px4_add_module(
 	SRCS
 		controllib_test_main.cpp
 	DEPENDS
-		platforms__common
 	)
 
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
+

src/lib/controllib/controllib_test/test_params.c

@@ -1,4 +1,4 @@
-#include <systemlib/param/param.h>
+#include <parameters/param.h>
 // WARNING:
 //  do not changes these unless
 //  you want to recompute the