From f19405fdb175ed0bccd91f1ebc6746641beda121 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Mon, 16 Jun 2014 09:24:18 +0200 Subject: [PATCH] move the cli stuff to subdir tool --- .gitignore | 1 + Makefile.am | 29 +--------- configure.ac | 1 + tool/Makefile.am | 54 +++++++++++++++++++ cmdline.ggo => tool/cmdline.ggo | 0 yubico-piv-tool.c => tool/yubico-piv-tool.c | 0 .../yubico-piv-tool.h2m | 0 7 files changed, 57 insertions(+), 28 deletions(-) create mode 100644 tool/Makefile.am rename cmdline.ggo => tool/cmdline.ggo (100%) rename yubico-piv-tool.c => tool/yubico-piv-tool.c (100%) rename yubico-piv-tool.h2m => tool/yubico-piv-tool.h2m (100%) diff --git a/.gitignore b/.gitignore index 9e7d978..55ca5d3 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile.am b/Makefile.am index 3f688eb..3ff81f3 100644 --- a/Makefile.am +++ b/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: diff --git a/configure.ac b/configure.ac index f231157..dd587c0 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,7 @@ fi AC_CONFIG_FILES([ Makefile + tool/Makefile tests/Makefile ]) AC_OUTPUT diff --git a/tool/Makefile.am b/tool/Makefile.am new file mode 100644 index 0000000..b41525c --- /dev/null +++ b/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 . +# +# 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) diff --git a/cmdline.ggo b/tool/cmdline.ggo similarity index 100% rename from cmdline.ggo rename to tool/cmdline.ggo diff --git a/yubico-piv-tool.c b/tool/yubico-piv-tool.c similarity index 100% rename from yubico-piv-tool.c rename to tool/yubico-piv-tool.c diff --git a/yubico-piv-tool.h2m b/tool/yubico-piv-tool.h2m similarity index 100% rename from yubico-piv-tool.h2m rename to tool/yubico-piv-tool.h2m