VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix "make dist" without "make all"

Browse Source 
Fix prerequisites and Automake variables in the Makefiles, so that
running "make dist" does not fail if the program is not built. When
running help2man, have it execute "gengetopt --show-help" instead
of the built program to obtain the help message.
This commit is contained in:
David Ward
2020-04-11 10:09:27 -04:00
parent 5abc01cf70
commit c18df66d4c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ccid/src/Makefile.am
View File

@@ -15,13 +15,11 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) ccid-emulator.ggo $(dist_man1_MANS)
dist_man1_MANS = ccid-emulator.1 dist_man1_MANS = ccid-emulator.1
ccid_emulator_SOURCES = ccid.c usbstring.c usb.c scutil.c $(BUILT_SOURCES) ccid_emulator_SOURCES = cmdline.c ccid.c usbstring.c usb.c scutil.c
ccid_emulator_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) ccid_emulator_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS)
ccid_emulator_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/src/OpenSC/src ccid_emulator_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/src/OpenSC/src
ccid-emulator.c: $(BUILT_SOURCES)
$(BUILT_SOURCES): ccid-emulator.ggo $(BUILT_SOURCES): ccid-emulator.ggo
$(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $< $(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $<
@@ -33,9 +31,11 @@ ccid-emulator.1:
$(AM_V_GEN)$(HELP2MAN) \ $(AM_V_GEN)$(HELP2MAN) \
--output=$@ \ --output=$@ \
--no-info \ --no-info \
--no-discard-stderr \
--source='$(PACKAGE_STRING)' \ --source='$(PACKAGE_STRING)' \
--help-option='--input=$< --set-package=$(PACKAGE) --set-version=$(VERSION) --show-help' \
--version-string='$(PACKAGE) $(VERSION)' \ --version-string='$(PACKAGE) $(VERSION)' \
$(builddir)/ccid-emulator $(GENGETOPT)
bin_PROGRAMS = ccid-emulator bin_PROGRAMS = ccid-emulator
@@ -43,5 +43,6 @@ bin_PROGRAMS = ccid-emulator
noinst_HEADERS = \ noinst_HEADERS = \
ccid.h \ ccid.h \
ccid-types.h \ ccid-types.h \
cmdline.h \
scutil.h \ scutil.h \
usbstring.h usbstring.h

9
pcsc-relay/src/Makefile.am
View File

@@ -21,13 +21,14 @@ pcsc-relay.1:
--no-info \ --no-info \
--no-discard-stderr \ --no-discard-stderr \
--source='$(PACKAGE_STRING)' \ --source='$(PACKAGE_STRING)' \
--help-option='--input=$< --set-package=$(PACKAGE) --set-version=$(VERSION) --show-help' \
--version-string='$(PACKAGE) $(VERSION)' \ --version-string='$(PACKAGE) $(VERSION)' \
$(builddir)/pcsc-relay $(GENGETOPT)
bin_PROGRAMS = pcsc-relay bin_PROGRAMS = pcsc-relay
pcsc_relay_SOURCES = pcsc-relay.c pcsc.c vpcd.c vpcd-driver.c opicc.c lnfc.c vicc.c lock.c $(BUILT_SOURCES) pcsc_relay_SOURCES = cmdline.c pcsc-relay.c pcsc.c vpcd.c vpcd-driver.c opicc.c lnfc.c vicc.c lock.c
pcsc_relay_LDADD = $(PCSC_LIBS) $(LIBNFC_LIBS) pcsc_relay_LDADD = $(PCSC_LIBS) $(LIBNFC_LIBS)
pcsc_relay_CFLAGS = $(PCSC_CFLAGS) $(LIBNFC_CFLAGS) pcsc_relay_CFLAGS = $(PCSC_CFLAGS) $(LIBNFC_CFLAGS)
@@ -35,9 +36,7 @@ if WIN32
pcsc_relay_LDADD += -lws2_32 pcsc_relay_LDADD += -lws2_32
endif endif
noinst_HEADERS = pcsc-relay.h vpcd.h lock.h noinst_HEADERS = cmdline.h pcsc-relay.h vpcd.h lock.h
pcsc-relay.c: $(BUILT_SOURCES)
$(BUILT_SOURCES): pcsc-relay.ggo $(BUILT_SOURCES): pcsc-relay.ggo
$(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $< $(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $<

2
virtualsmartcard/src/vpicc/Makefile.am
View File

@@ -37,7 +37,7 @@ $(builddir)/vicc: vicc.in Makefile
$(AM_V_GEN)$(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc $(AM_V_GEN)$(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc
@chmod +x $(builddir)/vicc @chmod +x $(builddir)/vicc
vicc.1: vicc.in vicc.1: $(builddir)/vicc
$(AM_V_GEN)$(HELP2MAN) \ $(AM_V_GEN)$(HELP2MAN) \
--no-discard-stderr \ --no-discard-stderr \
--output=$@ \ --output=$@ \