From: Thomas Fehr <fehr@suse.de>
Date: Thu, 13 Jan 2011 18:42:52 +0000 (+0100)
Subject: move binary snapper fro cli subdir to tools
X-Git-Tag: v0.1.3~545
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85f792582973fae1ab23a229e037e7811cf76dd0;p=thirdparty%2Fsnapper.git

move binary snapper fro cli subdir to tools
---

diff --git a/Makefile.am b/Makefile.am
index cb74d1ad..c7561242 100644
--- 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
index 75c800d7..00000000
--- 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
index 2440b8fb..00000000
--- 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 07b921ac..2c9823d0 100644
--- 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 bbbb2da8..371bcdae 100644
--- 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 9b62edf0..376214c9 100644
--- 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