diff --git a/windows/deps/Makefile b/windows/deps/Makefile index bc28af4003f64d3105a7604f6ae10a7ee937b5be..58f056ceed0f2c71cb3c503f34cd3b500a453b01 100644 --- a/windows/deps/Makefile +++ b/windows/deps/Makefile @@ -28,9 +28,9 @@ WGET_OPTIONS := --no-verbose --no-use-server-timestamps --retry-connrefused --re clean-tar clean-slicot-tar clean-x13as-tar \ clean-all clean-lib clean-src clean-tar -all: build octave matlab msys2 +all: build octave matlab msys2 x13as -build: build-slicot build-x13as +build: build-slicot clean-lib: clean-libslicot clean-matlab clean-octave clean-msys2 clean-x13as-bin @@ -193,30 +193,20 @@ clean-msys2: # X13AS # -tarballs/x13as_asciisrc-v$(X13AS_VERSION).tar.gz: +tarballs/x13as_ascii-v$(X13AS_VERSION).zip: mkdir -p tarballs - wget $(WGET_OPTIONS) -O $@ https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v$(X13AS_VERSION).tar.gz + wget $(WGET_OPTIONS) -O $@ https://www2.census.gov/software/x-13arima-seats/x13as/windows/program-archives/$(notdir $@) -sources64/x13as-$(X13AS_VERSION): tarballs/x13as_asciisrc-v$(X13AS_VERSION).tar.gz - rm -rf sources64/x13as-* - mkdir -p $@ - tar xf $< --directory $@ +lib64/x13as/x13as.exe: tarballs/x13as_ascii-v$(X13AS_VERSION).zip + unzip -d lib64 $< + mv lib64/x13as/x13as_ascii.exe $@ -lib64/x13as/x13as.exe: sources64/x13as-$(X13AS_VERSION) - make -C $< -f makefile.gf FC=x86_64-w64-mingw32-gfortran LINKER=x86_64-w64-mingw32-gfortran FFLAGS="-O2 -std=legacy" PROGRAM=x13as.exe - x86_64-w64-mingw32-strip $</x13as.exe - mkdir -p $(dir $@) - cp $</x13as.exe $@ - -build-x13as: lib64/x13as/x13as.exe +x13as: lib64/x13as/x13as.exe clean-x13as-tar: - rm -f tarballs/x13assrc_V$(X13AS_VERSION).tar.gz - -clean-x13as-src: - rm -rf sources64/x13as-$(X13AS_VERSION) + rm -f tarballs/x13as_ascii-v$(X13AS_VERSION).zip clean-x13as-bin: rm -rf lib64/x13as -clean-x13as-all: clean-x13as-tar clean-x13as-src clean-x13as-bin +clean-x13as-all: clean-x13as-tar clean-x13as-bin