fixed distcheck

vaginessa · Oct 10, 2016 · eb4c8a8 · eb4c8a8
1 parent d1cd0ea
commit eb4c8a8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 144 deletions.
diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
@@ -10,10 +10,10 @@ do_subst = $(SED) \
 BUILT_SOURCES = cmdline.h cmdline.c
 
 EXTRA_DIST  = ccid-emulator.ggo ccid-emulator.ggo.in
-EXTRA_DIST += $(shell find $(top_srcdir)/src/OpenSC/src -path '*/.git' -prune -o -type f -a -name '*.h' -print)
+EXTRA_DIST += $(shell find $(top_srcdir)/src/OpenSC/src -path '*/.git' -prune -o -type f -a \( -name '*.h' -o -name 'apdu.c' -o -name 'card.c' \) -print)
 MAINTAINERCLEANFILES = $(BUILT_SOURCES) ccid-emulator.ggo $(dist_man1_MANS)
 
-dist_man1_MANS		= $(abs_builddir)/ccid-emulator.1
+dist_man1_MANS		= ccid-emulator.1
 
 ccid_emulator_SOURCES = ccid.c usbstring.c usb.c scutil.c $(BUILT_SOURCES)
 ccid_emulator_LDADD =  $(OPENSC_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS)
@@ -29,13 +29,13 @@ ccid-emulator.ggo: ccid-emulator.ggo.in
 	$(do_subst) < $< > $(srcdir)/$@
 
 
-$(abs_builddir)/ccid-emulator.1:
+ccid-emulator.1:
 	$(HELP2MAN) \
 		--output=$@ \
 		--no-info \
 		--source='$(PACKAGE_STRING)' \
 		--version-string='$(PACKAGE) $(VERSION)' \
-		$(srcdir)/ccid-emulator
+		$(builddir)/ccid-emulator
 
 
 bin_PROGRAMS = ccid-emulator

diff --git a/pcsc-relay/src/Makefile.am b/pcsc-relay/src/Makefile.am
@@ -13,17 +13,17 @@ EXTRA_DIST  = pcsc-relay.ggo pcsc-relay.ggo.in
 EXTRA_DIST += picc.py
 MAINTAINERCLEANFILES = $(BUILT_SOURCES) npa-tool.ggo $(dist_man1_MANS)
 
-dist_man1_MANS		= $(abs_builddir)/pcsc-relay.1
+dist_man1_MANS		= pcsc-relay.1
 
 
-$(abs_builddir)/pcsc-relay.1:
+pcsc-relay.1:
 	$(HELP2MAN) \
 		--output=$@ \
 		--no-info \
 		--no-discard-stderr \
 		--source='$(PACKAGE_STRING)' \
 		--version-string='$(PACKAGE) $(VERSION)' \
-		$(srcdir)/pcsc-relay
+		$(builddir)/pcsc-relay
 
 
 bin_PROGRAMS = pcsc-relay

diff --git a/virtualsmartcard/Makefile.am b/virtualsmartcard/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src doc npa-example-data MacOSX
 
 EXTRA_DIST = test_vicc_with_npa-tool.sh test_vicc_with_handler_test.sh docs
+DISTCHECK_CONFIGURE_FLAGS = --enable-libpcsclite
 
 osx:
 	$(MAKE) -C MacOSX $@
diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
@@ -141,9 +141,10 @@ if test "${libpcsclite}" = no ; then
 		fi
 	fi
 else
-    builddir="`pwd`"
-	PCSC_CFLAGS="-DNO_LOG -I${builddir}/${srcdir}/src/pcsclite-vpcd/PCSC -I${builddir}/${srcdir}/src/pcsclite-vpcd"
-	PCSC_LIBS="$builddir/src/pcsclite-vpcd/libpcsclite.la"
+	builddir="`pwd`"
+	abs_srcdir="`cd ${srcdir}; pwd`"
+	PCSC_CFLAGS="-DNO_LOG -I${abs_srcdir}/src/pcsclite-vpcd/PCSC -I${builddir}/src/pcsclite-vpcd/PCSC"
+	PCSC_LIBS="${builddir}/src/pcsclite-vpcd/libpcsclite.la"
 	AC_SUBST(PCSC_CFLAGS)
 	AC_SUBST(PCSC_LIBS)
 fi

diff --git a/virtualsmartcard/src/pcsclite-vpcd/Makefile.am b/virtualsmartcard/src/pcsclite-vpcd/Makefile.am
@@ -12,6 +12,7 @@ noinst_HEADERS = misc.h
 nobase_include_HEADERS  = \
 						  PCSC/pcsclite.h \
 						  PCSC/winscard.h \
+						  PCSC/ifdhandler.h \
 						  PCSC/wintypes.h
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/virtualsmartcard/src/pcsclite-vpcd/PCSC/debug.c b/virtualsmartcard/src/pcsclite-vpcd/PCSC/debug.c
diff --git a/virtualsmartcard/src/vpicc/Makefile.am b/virtualsmartcard/src/vpicc/Makefile.am
@@ -37,8 +37,8 @@ $(builddir)/vicc: vicc.in Makefile
 	$(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc
 	chmod +x $(builddir)/vicc
 
-$(builddir)/vicc.1: vicc.in
+vicc.1: vicc.in
 	$(HELP2MAN) \
 		--no-discard-stderr \
 		--output=$@ \
-		$(srcdir)/vicc
+		$(builddir)/vicc