From 77ea089793f9a8e24fb533a257fc998fb06260a8 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Wed, 19 Jan 2022 23:01:06 +0100 Subject: [PATCH] pcsc-relay: removed disfunctional cross compilation script --- pcsc-relay/Makefile.am | 5 +--- pcsc-relay/configure.ac | 1 - pcsc-relay/win32/Makefile.am | 47 ------------------------------------ 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pcsc-relay/win32/Makefile.am diff --git a/pcsc-relay/Makefile.am b/pcsc-relay/Makefile.am index 8648a93..5215ac5 100644 --- a/pcsc-relay/Makefile.am +++ b/pcsc-relay/Makefile.am @@ -1,6 +1,3 @@ -SUBDIRS=src doc win32 +SUBDIRS=src doc EXTRA_DIST = docs - -win: - make -C win32 $@ diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac index ad00537..caa1a64 100644 --- a/pcsc-relay/configure.ac +++ b/pcsc-relay/configure.ac @@ -162,7 +162,6 @@ AC_FUNC_REALLOC AC_CONFIG_FILES([Makefile doc/Makefile - win32/Makefile src/Makefile]) AC_OUTPUT diff --git a/pcsc-relay/win32/Makefile.am b/pcsc-relay/win32/Makefile.am deleted file mode 100644 index 8c691a5..0000000 --- a/pcsc-relay/win32/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -EXTRA_DIST = - - -all-local: - @echo "Use \`make win\` to cross compile for Windows" - - -WIN32_DIR = $(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)_win32 - - -MINGW ?= i686-w64-mingw32 -MINGW_DIR=/usr/$(MINGW) - - -LIBNFC_DIR=$(abs_builddir)/libnfc -LIBNFC_DLL=$(WIN32_DIR)/bin/libnfc-4.dll -$(LIBNFC_DIR)/configure.ac: - git clone git://github.com/frankmorgner/libnfc $(LIBNFC_DIR) -$(LIBNFC_DLL): $(LIBNFC_DIR)/configure.ac - cd $(LIBNFC_DIR) && env MINGW=$(MINGW) sh mingw-cross-configure.sh --prefix=/ - make -C $(LIBNFC_DIR) install DESTDIR=$(WIN32_DIR) - - -PCSC_RELAY_EXE=$(WIN32_DIR)/bin/pcsc-relay.exe -$(PCSC_RELAY_EXE): $(LIBNFC_DLL) - cd $(top_builddir) && ./configure \ - --prefix=/ \ - --host=$(MINGW) --target=$(MINGW) \ - PKG_CONFIG_SYSROOT_DIR=$(WIN32_DIR) \ - PKG_CONFIG_LIBDIR=$(WIN32_DIR)/lib/pkgconfig \ - CFLAGS=-I$(MINGW_DIR)/include \ - LDFLAGS=-L$(MINGW_DIR)/lib \ - PCSC_LIBS="-lwinscard" - make -C $(top_builddir) install DESTDIR=$(WIN32_DIR) - - -LIBUSB_DLL=$(LIBNFC_DIR)/libusb-win32-bin-*/bin/x86/libusb0_x86.dll -win: $(PCSC_RELAY_EXE) - $(INSTALL_PROGRAM) $(LIBUSB_DLL) $(WIN32_DIR)/bin/libusb0.dll - -clean-local: - rm -rf $(WIN32_DIR) - test ! -d $(LIBNFC_DIR) || \ - make -C $(LIBNFC_DIR) clean - -distclean-local: - rm -rf $(LIBNFC_DIR)