From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 Jan 2016 12:17:43 +0000 (+0100)
Subject: libsmartcols: add samples directory
X-Git-Tag: v2.28-rc1~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f09ae9d5d711ca299f6f25d194d2cdddee6c748;p=thirdparty%2Futil-linux.git

libsmartcols: add samples directory

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 2c1ffbc057..cb33535a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -954,7 +954,6 @@ AC_ARG_ENABLE([libsmartcols],
 )
 UL_BUILD_INIT([libsmartcols])
 AM_CONDITIONAL([BUILD_LIBSMARTCOLS], [test "x$build_libsmartcols" = xyes])
-AM_CONDITIONAL([BUILD_LIBSMARTCOLS_TESTS], [test "x$build_libsmartcols" = xyes -a "x$enable_static" = xyes])
 
 AC_SUBST([LIBSMARTCOLS_VERSION])
 AC_SUBST([LIBSMARTCOLS_VERSION_INFO])
diff --git a/libsmartcols/Makemodule.am b/libsmartcols/Makemodule.am
index d5b91ffa37..012848b2b0 100644
--- a/libsmartcols/Makemodule.am
+++ b/libsmartcols/Makemodule.am
@@ -1,6 +1,7 @@
 if BUILD_LIBSMARTCOLS
 
 include libsmartcols/src/Makemodule.am
+include libsmartcols/samples/Makemodule.am
 
 if ENABLE_GTK_DOC
 # Docs uses separate Makefiles
diff --git a/libsmartcols/src/test.c b/libsmartcols/samples/tree.c
similarity index 98%
rename from libsmartcols/src/test.c
rename to libsmartcols/samples/tree.c
index f520d4c1c5..7f41f9eb42 100644
--- a/libsmartcols/src/test.c
+++ b/libsmartcols/samples/tree.c
@@ -212,11 +212,11 @@ int main(int argc, char *argv[])
 	}
 
 	scols_table_enable_colors(tb, 1);
-	scols_table_set_title(tb, "This is table title", SCOLS_TITLE_CENTER, "red");
-
 	setup_columns(tb, notree);
 
-	while (optind < argc)
+	if (optind == argc)
+		add_lines(tb, ".");
+	else while (optind < argc)
 		add_lines(tb, argv[optind++]);
 
 	scols_print_table(tb);
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 45a7eeab4c..c2ec515d46 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -43,19 +43,6 @@ EXTRA_DIST += \
 	libsmartcols/src/libsmartcols.sym \
 	libsmartcols/src/libsmartcols.h.in
 
-
-if BUILD_LIBSMARTCOLS_TESTS
-check_PROGRAMS += test_smartcols
-
-libsmartcols_tests_cflags = $(libsmartcols_la_CFLAGS)
-libsmartcols_tests_ldadd  = libsmartcols.la libcommon.la libtcolors.la
-
-test_smartcols_SOURCES = libsmartcols/src/test.c
-test_smartcols_CFLAGS = $(libsmartcols_tests_cflags)
-test_smartcols_LDADD = $(libsmartcols_tests_ldadd)
-endif # BUILD_LIBSMARTCOLS_TESTS
-
-
 # move lib from $(usrlib_execdir) to $(libdir) if needed
 install-exec-hook-libsmartcols:
 	if test "$(usrlib_execdir)" != "$(libdir)" -a -f "$(DESTDIR)$(usrlib_execdir)/libsmartcols.so"; then \
diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
index 047373024a..ce589684ef 100644
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c
@@ -359,6 +359,8 @@ int scols_column_is_noextremes(struct libscols_column *cl)
  * Gets the value of @cl's flag wrap.
  *
  * Returns: wrap flag value, negative value in case of an error.
+ *
+ * Since: 2.28
  */
 int scols_column_is_wrap(struct libscols_column *cl)
 {