diff --git a/.gitignore b/.gitignore
index a224e0e..4c1cce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,4 +62,7 @@ tool/yubico-piv-tool
 tool/yubico-piv-tool.1
 tool/yubico-piv-tool.o
 tool/.libs/
+tool/libpiv_cmd.la
+tool/libpiv_cmd_la-cmdline.lo
+tool/libpiv_cmd_la-cmdline.o
 
diff --git a/tool/Makefile.am b/tool/Makefile.am
index ab6503d..60f13f4 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -30,9 +30,11 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 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)
-yubico_piv_tool_LDADD += ../lib/libykpiv.la
+yubico_piv_tool_LDADD = $(OPENSSL_LIBS) ../lib/libykpiv.la libpiv_cmd.la
+
+noinst_LTLIBRARIES = libpiv_cmd.la
+libpiv_cmd_la_SOURCES = cmdline.ggo cmdline.c cmdline.h
+libpiv_cmd_la_CFLAGS =
 
 cmdline.c cmdline.h: cmdline.ggo Makefile.am
 	$(GENGETOPT) --input $^