From 167e0a5945f7aeb2cd679977142be247c9f0c936 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 5 Nov 2016 12:22:49 +0100 Subject: [PATCH] Moved test add_config_from_confit to tools. --- .gitignore | 2 +- Makefile.am | 2 +- configure.ac | 1 + tests/Makefile.am | 1 - tools/Makefile.am | 13 +++++++++++++ .../add_config_from_confi.c | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 tools/Makefile.am rename tests/test_add_config_from_confi.c => tools/add_config_from_confi.c (90%) diff --git a/.gitignore b/.gitignore index b04bb01..010c263 100644 --- a/.gitignore +++ b/.gitignore @@ -52,8 +52,8 @@ tests/test tests/test_get_configs_list tests/test_get_tree tests/test_add_config -tests/test_add_config_from_confi tests/test_set_config +tools/add_config_from_confi *.csv gtk-doc.m4 *.gir diff --git a/Makefile.am b/Makefile.am index a066227..5365a8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection -SUBDIRS = src plugins tests data docs +SUBDIRS = src plugins tools tests data docs EXTRA_DIST = libzakconfi.pc.in diff --git a/configure.ac b/configure.ac index 15b4d4d..c57c16a 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,7 @@ AC_CONFIG_FILES([ plugins/db/Makefile plugins/file/Makefile tests/Makefile + tools/Makefile data/Makefile docs/Makefile docs/reference/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index bf61e14..5820ef6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,6 @@ LDADD = $(top_builddir)/src/libzakconfi.la noinst_PROGRAMS = test \ test_add_config \ - test_add_config_from_confi \ test_get_configs_list \ test_get_tree \ test_set_config diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..0102808 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,13 @@ +AM_CPPFLAGS = $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(LIBCONFI_CFLAGS) \ + -I$(top_srcdir)/src \ + -DPLUGINSDIR=\""$(libdir)/$(PACKAGE)/plugins"\" + +LIBS = $(LIBCONFI_LIBS) \ + -L../src -lzakconfi \ + -export-dynamic + +LDADD = $(top_builddir)/src/libzakconfi.la + +noinst_PROGRAMS = add_config_from_confi diff --git a/tests/test_add_config_from_confi.c b/tools/add_config_from_confi.c similarity index 90% rename from tests/test_add_config_from_confi.c rename to tools/add_config_from_confi.c index 4b24098..f069d19 100644 --- a/tests/test_add_config_from_confi.c +++ b/tools/add_config_from_confi.c @@ -30,7 +30,7 @@ main (int argc, char **argv) if (argc < 5) { - g_error ("Usage: test_add_config "); + g_error ("Usage: add_config_from_confi "); return 0; } -- 2.49.0