move the cli stuff to subdir tool

.gitignore

@@ -21,6 +21,7 @@ yubico-piv-tool.o
 *.c~
 *.h~
 ChangeLog
+build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
 build-aux/depcomp

Makefile.am

@@ -24,39 +24,12 @@
 # non-source form of such a combination shall include the source code
 # for the parts of OpenSSL used as well as that of the covered work.
 
-SUBDIRS = . tests
-
-AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS)
+SUBDIRS = tool tests
 
 ACLOCAL_AMFLAGS = -I m4
 
-bin_PROGRAMS = yubico-piv-tool
-yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
-yubico_piv_tool_SOURCES += cmdline.ggo cmdline.c cmdline.h
-yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
-yubico_piv_tool_LDADD += $(LTLIBWINSCARD) $(PCSC_MACOSX_LIBS)
-
-cmdline.c cmdline.h: cmdline.ggo Makefile.am
-	gengetopt --input $^
-
-BUILT_SOURCES = cmdline.c cmdline.h
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-
-# Doc.
-
-dist_man_MANS = yubico-piv-tool.1
-MAINTAINERCLEANFILES += $(dist_man_MANS)
-
 EXTRA_DIST = windows.mk mac.mk tests/basic.sh
 
-yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \
-		$(top_srcdir)/configure.ac
-	$(HELP2MAN) --no-info \
-		--name="Yubico PIV tool" \
-		--include=$(top_srcdir)/yubico-piv-tool.h2m \
-		--output=$@ $(top_builddir)/yubico-piv-tool$(EXEEXT)
-
 # Maintainer rules.
 
 ChangeLog:

configure.ac

@@ -136,6 +136,7 @@ fi
 
 AC_CONFIG_FILES([
   Makefile
+  tool/Makefile
   tests/Makefile
 ])
 AC_OUTPUT

tool/Makefile.am

@@ -0,0 +1,54 @@
+# Copyright (c) 2014 Yubico AB
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Additional permission under GNU GPL version 3 section 7
+#
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, We grant you additional 
+# permission to convey the resulting work. Corresponding Source for a
+# non-source form of such a combination shall include the source code
+# for the parts of OpenSSL used as well as that of the covered work.
+
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
+AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS)
+
+bin_PROGRAMS = yubico-piv-tool
+yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
+yubico_piv_tool_SOURCES += cmdline.ggo cmdline.c cmdline.h
+yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
+yubico_piv_tool_LDADD += $(LTLIBWINSCARD) $(PCSC_MACOSX_LIBS)
+
+cmdline.c cmdline.h: cmdline.ggo Makefile.am
+	gengetopt --input $^
+
+BUILT_SOURCES = cmdline.c cmdline.h
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
+# Doc.
+
+dist_man_MANS = yubico-piv-tool.1
+MAINTAINERCLEANFILES += $(dist_man_MANS)
+
+EXTRA_DIST = windows.mk mac.mk tests/basic.sh
+
+yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \
+		$(top_srcdir)/configure.ac
+	$(HELP2MAN) --no-info \
+		--name="Yubico PIV tool" \
+		--include=$(srcdir)/yubico-piv-tool.h2m \
+		--output=$@ $(builddir)/yubico-piv-tool$(EXEEXT)