X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=CMakeLists.txt;h=7db28c0ab2ad10e40c527d8d098063a577dcf75c;hp=c1e5a09c633a4d2bfee9a97dffd6163e4b3ba5dd;hb=6a8fae38791572d72d4241856b5704684a8ee7c6;hpb=002fcb582d73f6d5c354a7f7d844fe87f07fe9d2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e5a09..7db28c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,20 +26,42 @@ ADD_LIBRARY(blkid-tiny SHARED
 		libblkid-tiny/hfs.c
 		libblkid-tiny/swap.c
 		libblkid-tiny/ubifs.c
-		libblkid-tiny/squashfs.c)
+		libblkid-tiny/squashfs.c
+		libblkid-tiny/btrfs.c
+		libblkid-tiny/f2fs.c
+		)
 INSTALL(TARGETS blkid-tiny LIBRARY DESTINATION lib)
 
 ADD_LIBRARY(ubi-utils STATIC
 		libubi/libubi.c
 		libubi/libubi-tiny.c
 		libubi/ubiutils-common.c)
+INSTALL(TARGETS ubi-utils ARCHIVE DESTINATION lib)
+
+FIND_PATH(ubox_include_dir libubox/ulog.h)
+INCLUDE_DIRECTORIES(${ubox_include_dir})
+
+SET_TARGET_PROPERTIES(ubi-utils PROPERTIES COMPILE_FLAGS
+		"-ffunction-sections -fdata-sections")
+
+INSTALL(FILES libubi/libubi-tiny.h libubi/libubi.h libubi/ubi-media.h
+		libubi/ubi-user.h libubi/ubi-media.h
+	DESTINATION include
+)
 
 ADD_EXECUTABLE(mount_root mount_root.c)
 TARGET_LINK_LIBRARIES(mount_root fstools)
 INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin)
 
+find_library(json NAMES json-c json)
+
 ADD_EXECUTABLE(block block.c)
-TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json)
+IF(DEFINED CMAKE_UBIFS_EXTROOT)
+	ADD_DEFINITIONS(-DUBIFS_EXTROOT)
+	TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils ${json})
+ELSE(DEFINED CMAKE_UBIFS_EXTROOT)
+	TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ${json})
+ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
 INSTALL(TARGETS block RUNTIME DESTINATION sbin)
 
 ADD_EXECUTABLE(jffs2reset jffs2reset.c)
@@ -51,5 +73,5 @@ TARGET_LINK_LIBRARIES(snapshot_tool fstools)
 INSTALL(TARGETS snapshot_tool RUNTIME DESTINATION sbin)
 
 ADD_EXECUTABLE(ubi ubi.c)
-TARGET_LINK_LIBRARIES(ubi ubi-utils)
+TARGET_LINK_LIBRARIES(ubi ubi-utils ubox)
 INSTALL(TARGETS ubi RUNTIME DESTINATION sbin)