move binary snapper fro cli subdir to tools

diff --git a/Makefile.am b/Makefile.am
index cb74d1adb732244d1f476314803b09491a22a13b..c7561242707e356d502dbc7c35736d2598daebce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper
 #
 
-SUBDIRS = snapper examples cli tools
+SUBDIRS = snapper examples tools
 
 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
 

diff --git a/cli/.gitignore b/cli/.gitignore
deleted file mode 100644 (file)
index 75c800d..0000000
--- a/cli/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-snapper

diff --git a/cli/Makefile.am b/cli/Makefile.am
deleted file mode 100644 (file)
index 2440b8f..0000000
--- a/cli/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile.am for snapper/cli
-#
-
-INCLUDES = -I$(top_srcdir)
-
-LDADD = ../snapper/libsnapper.la
-
-bin_PROGRAMS = snapper
-
-snapper_SOURCES = cli.cc
-

diff --git a/configure.in b/configure.in
index 07b921ac8903e8a500d572f4a35f5db3bc3c048e..2c9823d0e710d25914fe214334525634dd7e671a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,5 @@ AC_OUTPUT(
        snapper/Makefile
        examples/Makefile
        tools/Makefile
-       cli/Makefile
        package/snapper.spec:snapper.spec.in
 )

diff --git a/tools/.gitignore b/tools/.gitignore
index bbbb2da8c4cf4b388aecc1972bc803786caab281..371bcdae329c4b52985728a8ce4c73c5c281435f 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,2 +1,4 @@
 compare-dirs.o
 compare-dirs
+cli.o
+snapper

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9b62edf0d39c3853c1fda387d42c3b4cfaf9c470..376214c90ae3eb40a109e901a864648eb204e492 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,3 +12,6 @@ toolsbin_PROGRAMS = compare-dirs
 
 compare_dirs_SOURCES = compare-dirs.cc
 
+bin_PROGRAMS = snapper
+
+snapper_SOURCES = cli.cc

diff --git a/cli/cli.cc b/tools/cli.cc
similarity index 100%
rename from cli/cli.cc
rename to tools/cli.cc