X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=CMakeLists.txt;h=834b5b60949ef8d1677623bfeafb5ca649d60bf7;hp=1aa9a869e3e3c4a6f34b60ef826218cdc7a1f467;hb=31d66f2c3b2afbc9eaae4e2c22103d0f79e9503e;hpb=f8d43c5f222b99d5a7a0e2bd1fdc0d442e030e89

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aa9a86..834b5b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,50 +11,20 @@ IF(APPLE)
 ENDIF()
 
 find_library(json NAMES json-c json)
-SET(LIBS ubox uci ubus ${json} blobmsg_json)
 
 IF(DEBUG)
   ADD_DEFINITIONS(-DDEBUG -g3)
 ENDIF()
 
-ADD_EXECUTABLE(mount_root mount_root.c)
-TARGET_LINK_LIBRARIES(mount_root ${LIBS})
-
-INSTALL(TARGETS mount_root
-	RUNTIME DESTINATION sbin
-)
-
-ADD_EXECUTABLE(block block.c
-		libblkid-tiny/libblkid-tiny.c
-		libblkid-tiny/md5.c
-		libblkid-tiny/mkdev.c
-		libblkid-tiny/ext.c
-		libblkid-tiny/jffs2.c
-		libblkid-tiny/vfat.c
-		libblkid-tiny/swap.c
-		libblkid-tiny/squashfs.c)
-TARGET_LINK_LIBRARIES(block ${LIBS} blobmsg_json)
-
-INSTALL(TARGETS block
-	RUNTIME DESTINATION sbin
-)
-
 ADD_EXECUTABLE(kmodloader kmodloader.c)
-TARGET_LINK_LIBRARIES(kmodloader ${LIBS})
+TARGET_LINK_LIBRARIES(kmodloader ubox)
 
 INSTALL(TARGETS kmodloader
 	RUNTIME DESTINATION sbin
 )
 
-ADD_EXECUTABLE(board board.c)
-TARGET_LINK_LIBRARIES(board ${LIBS})
-
-INSTALL(TARGETS board
-	RUNTIME DESTINATION sbin
-)
-
 ADD_EXECUTABLE(lsbloader lsbloader.c)
-TARGET_LINK_LIBRARIES(lsbloader ${LIBS})
+TARGET_LINK_LIBRARIES(lsbloader ubox ubus)
 
 INSTALL(TARGETS lsbloader
 	RUNTIME DESTINATION sbin
@@ -66,19 +36,19 @@ INSTALL(TARGETS validate
 )
 
 ADD_EXECUTABLE(validate_data validate/cli.c)
-TARGET_LINK_LIBRARIES(validate_data ${LIBS} validate)
+TARGET_LINK_LIBRARIES(validate_data ubox uci validate)
 INSTALL(TARGETS validate_data
 	RUNTIME DESTINATION sbin
 )
 
 ADD_EXECUTABLE(logd log/logd.c log/syslog.c)
-TARGET_LINK_LIBRARIES(logd ${LIBS})
+TARGET_LINK_LIBRARIES(logd ubox ubus)
 INSTALL(TARGETS logd
 	RUNTIME DESTINATION sbin
 )
 
 ADD_EXECUTABLE(logread log/logread.c)
-TARGET_LINK_LIBRARIES(logread ${LIBS})
+TARGET_LINK_LIBRARIES(logread ubox ubus ${json} blobmsg_json)
 INSTALL(TARGETS logread
 	RUNTIME DESTINATION sbin
 )