Merge branch 'v5-dev'

Signed-off-by: Damien Le Moal <[email protected]>

Author: damien-lemoal

.gitignore

@@ -28,7 +28,7 @@
 zbc_info
 zbc_inquiry
 zbc_report_zones
-zbc_reset_write_ptr
+zbc_reset_zone
 zbc_close_zone
 zbc_finish_zone
 zbc_open_zone
@@ -40,7 +40,7 @@ gzbc
 
 test/programs/zbc_test_print_devinfo
 test/programs/zbc_test_report_zones
-test/programs/zbc_test_reset_write_ptr
+test/programs/zbc_test_reset_zone
 test/programs/zbc_test_close_zone
 test/programs/zbc_test_finish_zone
 test/programs/zbc_test_open_zone

Makefile.am

@@ -18,21 +18,24 @@ pkgconf_DATA = libzbc.pc
 pkginclude_HEADERS =
 noinst_HEADERS =
 bin_PROGRAMS =
-lib_LTLIBRARIES = 
+lib_LTLIBRARIES =
 noinst_PROGRAMS =
 
 libzbc_ldadd = $(LDADD) libzbc.la
 
 include include/Makemodule.am
 include lib/Makemodule.am
+include tools/zone_op/Makemodule.am
+
 include tools/info/Makemodule.am
 include tools/report_zones/Makemodule.am
-include tools/reset_write_ptr/Makemodule.am
-include tools/read_zone/Makemodule.am
-include tools/write_zone/Makemodule.am
+include tools/reset_zone/Makemodule.am
 include tools/open_zone/Makemodule.am
 include tools/close_zone/Makemodule.am
 include tools/finish_zone/Makemodule.am
+include tools/read_zone/Makemodule.am
+include tools/write_zone/Makemodule.am
+
 include tools/set_write_ptr/Makemodule.am
 include tools/set_zones/Makemodule.am
 
@@ -43,7 +46,7 @@ endif
 if BUILD_TEST
 include test/programs/print_devinfo/Makemodule.am
 include test/programs/report_zones/Makemodule.am
-include test/programs/reset_write_ptr/Makemodule.am
+include test/programs/reset_zone/Makemodule.am
 include test/programs/open_zone/Makemodule.am
 include test/programs/close_zone/Makemodule.am
 include test/programs/finish_zone/Makemodule.am

README

@@ -1,5 +1,5 @@
 
-AC_INIT([libzbc], [4.3.4], [[email protected], [email protected]])
+AC_INIT([libzbc], [5.0.0], [[email protected], [email protected]])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([include/config.h])
@@ -41,15 +41,16 @@ AC_ARG_WITH([test],
             [AS_HELP_STRING([--with-test], [Build compatibility test suite [default=no]])],
             [WITH_TEST=1],
             [WITH_TEST=0])
-AM_CONDITIONAL([BUILD_TEST], [test "$WITH_TEST" -eq 1])
+AS_IF([test "$WITH_TEST" -eq 1],
+[
+	AM_CONDITIONAL([BUILD_TEST], true)
+	AC_DEFINE([HAVE_DEVTEST], [1], ["Enable API test mode"])
+])
 
 AC_CONFIG_FILES([
 	libzbc.pc
 	Makefile
 ])
 
-# Build lkvs
-#AC_CONFIG_SUBDIRS([tools/lkvs])
-
 AC_OUTPUT