diff --git a/pcsc-relay/win32/Makefile.am b/pcsc-relay/win32/Makefile.am index 266abc7..fc82c4b 100644 --- a/pcsc-relay/win32/Makefile.am +++ b/pcsc-relay/win32/Makefile.am @@ -10,9 +10,9 @@ IMAGE=$(abs_builddir)/image LIBNFC_DIR=$(abs_builddir)/libnfc LIBNFC_DLL=$(IMAGE)/bin/libnfc-3.dll -$(LIBNFC_DIR): +$(LIBNFC_DIR)/configure.ac: svn co -r1327 http://libnfc.googlecode.com/svn/trunk $@ -$(LIBNFC_DLL): $(LIBNFC_DIR) +$(LIBNFC_DLL): $(LIBNFC_DIR)/configure.ac grep i686-w64-mingw32 $(LIBNFC_DIR)/mingw-cross-configure.sh > /dev/null || \ patch -p0 -d $< < libnfc_mingw.patch cd $< && sh mingw-cross-configure.sh --prefix=$(IMAGE) @@ -22,7 +22,7 @@ $(LIBNFC_DLL): $(LIBNFC_DIR) MINGW ?= i686-w64-mingw32 MINGW_DIR=/usr/$(MINGW) PCSC_RELAY_EXE=$(IMAGE)/bin/pcsc-relay.exe -$(PCSC_RELAY_EXE): $(LIBNFC_DIR) $(LIBNFC_DLL) +$(PCSC_RELAY_EXE): $(LIBNFC_DLL) cd $(abs_top_builddir) && ./configure \ --prefix=$(IMAGE) \ --host=$(MINGW) --target=$(MINGW) \ @@ -36,7 +36,7 @@ $(PCSC_RELAY_EXE): $(LIBNFC_DIR) $(LIBNFC_DLL) LIBUSB_DLL=$(LIBNFC_DIR)/libusb-win32-bin-*/bin/x86/libusb0_x86.dll WIN32_DIR=$(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)_win32 win: $(PCSC_RELAY_EXE) - mkdir -p $(WIN32_DIR) + $(INSTALL) -d $(WIN32_DIR) $(INSTALL_PROGRAM) -t $(WIN32_DIR) \ $(LIBNFC_DLL) $(PCSC_RELAY_EXE) $(INSTALL_PROGRAM) $(LIBUSB_DLL) $(WIN32_DIR)/libusb0.dll