more work on automake dependencies to rebuild things correctly

relates #53
This commit is contained in:
Klas Lindfors
2015-12-15 09:23:04 +01:00
parent 1c2d98b16d
commit 24d9569f65
+3 -3
View File
@@ -32,7 +32,7 @@ AM_CPPFLAGS = $(OPENSSL_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib
bin_PROGRAMS = yubico-piv-tool bin_PROGRAMS = yubico-piv-tool
yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m $(top_srcdir)/configure.ac yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(top_builddir)/lib/libykpiv.la yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(top_builddir)/lib/libykpiv.la
yubico_piv_tool_LDADD += libpiv_cmd.la libpiv_util.la yubico_piv_tool_LDADD += libpiv_cmd.la libpiv_util.la
@@ -43,7 +43,7 @@ libpiv_cmd_la_CFLAGS =
libpiv_util_la_SOURCES = util.c util.h libpiv_util_la_SOURCES = util.c util.h
libpiv_util_la_LIBADD = $(OPENSSL_LIBS) libpiv_util_la_LIBADD = $(OPENSSL_LIBS)
cmdline.c cmdline.h: cmdline.ggo Makefile.am cmdline.c cmdline.h: cmdline.ggo Makefile.am $(top_srcdir)/configure.ac
$(GENGETOPT) --input $^ $(GENGETOPT) --input $^
BUILT_SOURCES = cmdline.c cmdline.h BUILT_SOURCES = cmdline.c cmdline.h
@@ -54,7 +54,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
dist_man_MANS = yubico-piv-tool.1 dist_man_MANS = yubico-piv-tool.1
MAINTAINERCLEANFILES += $(dist_man_MANS) MAINTAINERCLEANFILES += $(dist_man_MANS)
yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) $(libpiv_cmd_la_SOURCES)
$(HELP2MAN) --no-info \ $(HELP2MAN) --no-info \
--name="Yubico PIV tool" \ --name="Yubico PIV tool" \
--include=$(srcdir)/yubico-piv-tool.h2m \ --include=$(srcdir)/yubico-piv-tool.h2m \