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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e5a09..d3762af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,20 +26,36 @@ 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
+		)
 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)
+
+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)
 
 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)
+ELSE(DEFINED CMAKE_UBIFS_EXTROOT)
+	TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json)
+ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
 INSTALL(TARGETS block RUNTIME DESTINATION sbin)
 
 ADD_EXECUTABLE(jffs2reset jffs2reset.c)
@@ -51,5 +67,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)