Skip to content

Commit e1dc36c

Browse files
committed
Update to 1.5.0#
2 parents 3be161d + e72080a commit e1dc36c

38 files changed

+1317
-1272
lines changed

Makefile.in

Lines changed: 20 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.3 from Makefile.am.
1+
# Makefile.in generated by automake 1.13.4 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -14,17 +14,7 @@
1414

1515
@SET_MAKE@
1616
VPATH = @srcdir@
17-
am__is_gnu_make = { \
18-
if test -z '$(MAKELEVEL)'; then \
19-
false; \
20-
elif test -n '$(MAKE_HOST)'; then \
21-
true; \
22-
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23-
true; \
24-
else \
25-
false; \
26-
fi; \
27-
}
17+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
2818
am__make_running_with_option = \
2919
case $${target_option-} in \
3020
?) ;; \
@@ -86,12 +76,13 @@ NORMAL_UNINSTALL = :
8676
PRE_UNINSTALL = :
8777
POST_UNINSTALL = :
8878
subdir = .
79+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
80+
$(top_srcdir)/configure $(am__configure_deps) install-sh \
81+
missing
8982
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9083
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9184
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9285
$(ACLOCAL_M4)
93-
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
94-
$(am__configure_deps) $(am__DIST_COMMON)
9586
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
9687
configure.lineno config.status.lineno
9788
mkinstalldirs = $(install_sh) -d
@@ -131,7 +122,7 @@ am__recursive_targets = \
131122
$(RECURSIVE_CLEAN_TARGETS) \
132123
$(am__extra_recursive_targets)
133124
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
134-
cscope distdir distdir-am dist dist-all distcheck
125+
cscope distdir dist dist-all distcheck
135126
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
136127
# Read a list of newline-separated strings from the standard input,
137128
# and print each of them once, without duplicates. Input order is
@@ -153,7 +144,6 @@ ETAGS = etags
153144
CTAGS = ctags
154145
CSCOPE = cscope
155146
DIST_SUBDIRS = $(SUBDIRS)
156-
am__DIST_COMMON = $(srcdir)/Makefile.in install-sh missing
157147
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
158148
distdir = $(PACKAGE)-$(VERSION)
159149
top_distdir = $(distdir)
@@ -192,8 +182,6 @@ am__relativize = \
192182
DIST_ARCHIVES = $(distdir).tar.gz
193183
GZIP_ENV = --best
194184
DIST_TARGETS = dist-gzip
195-
# Exists only to be overridden by the user if desired.
196-
AM_DISTCHECK_DVI_TARGET = dvi
197185
distuninstallcheck_listfiles = find . -type f -print
198186
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
199187
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -263,7 +251,6 @@ pdfdir = @pdfdir@
263251
prefix = @prefix@
264252
program_transform_name = @program_transform_name@
265253
psdir = @psdir@
266-
runstatedir = @runstatedir@
267254
sbindir = @sbindir@
268255
sharedstatedir = @sharedstatedir@
269256
srcdir = @srcdir@
@@ -291,14 +278,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
291278
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
292279
$(am__cd) $(top_srcdir) && \
293280
$(AUTOMAKE) --foreign Makefile
281+
.PRECIOUS: Makefile
294282
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
295283
@case '$?' in \
296284
*config.status*) \
297285
echo ' $(SHELL) ./config.status'; \
298286
$(SHELL) ./config.status;; \
299287
*) \
300-
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
301-
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
288+
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
289+
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
302290
esac;
303291

304292
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -416,10 +404,7 @@ distclean-tags:
416404
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
417405
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
418406

419-
distdir: $(BUILT_SOURCES)
420-
$(MAKE) $(AM_MAKEFLAGS) distdir-am
421-
422-
distdir-am: $(DISTFILES)
407+
distdir: $(DISTFILES)
423408
$(am__remove_distdir)
424409
test -d "$(distdir)" || mkdir "$(distdir)"
425410
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -484,7 +469,7 @@ distdir-am: $(DISTFILES)
484469
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
485470
|| chmod -R a+r "$(distdir)"
486471
dist-gzip: distdir
487-
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
472+
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
488473
$(am__post_remove_distdir)
489474

490475
dist-bzip2: distdir
@@ -499,22 +484,12 @@ dist-xz: distdir
499484
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
500485
$(am__post_remove_distdir)
501486

502-
dist-zstd: distdir
503-
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
504-
$(am__post_remove_distdir)
505-
506487
dist-tarZ: distdir
507-
@echo WARNING: "Support for distribution archives compressed with" \
508-
"legacy program 'compress' is deprecated." >&2
509-
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
510488
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
511489
$(am__post_remove_distdir)
512490

513491
dist-shar: distdir
514-
@echo WARNING: "Support for shar distribution archives is" \
515-
"deprecated." >&2
516-
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
517-
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
492+
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
518493
$(am__post_remove_distdir)
519494

520495
dist-zip: distdir
@@ -532,7 +507,7 @@ dist dist-all:
532507
distcheck: dist
533508
case '$(DIST_ARCHIVES)' in \
534509
*.tar.gz*) \
535-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
510+
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
536511
*.tar.bz2*) \
537512
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
538513
*.tar.lz*) \
@@ -542,27 +517,24 @@ distcheck: dist
542517
*.tar.Z*) \
543518
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
544519
*.shar.gz*) \
545-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
520+
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
546521
*.zip*) \
547522
unzip $(distdir).zip ;;\
548-
*.tar.zst*) \
549-
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
550523
esac
551524
chmod -R a-w $(distdir)
552525
chmod u+w $(distdir)
553-
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
526+
mkdir $(distdir)/_build $(distdir)/_inst
554527
chmod a-w $(distdir)
555528
test -d $(distdir)/_build || exit 0; \
556529
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
557530
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
558531
&& am__cwd=`pwd` \
559-
&& $(am__cd) $(distdir)/_build/sub \
560-
&& ../../configure \
532+
&& $(am__cd) $(distdir)/_build \
533+
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
561534
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
562535
$(DISTCHECK_CONFIGURE_FLAGS) \
563-
--srcdir=../.. --prefix="$$dc_install_base" \
564536
&& $(MAKE) $(AM_MAKEFLAGS) \
565-
&& $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
537+
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
566538
&& $(MAKE) $(AM_MAKEFLAGS) check \
567539
&& $(MAKE) $(AM_MAKEFLAGS) install \
568540
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -723,7 +695,7 @@ uninstall-am:
723695
am--refresh check check-am clean clean-cscope clean-generic \
724696
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
725697
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
726-
dist-zstd distcheck distclean distclean-generic distclean-tags \
698+
distcheck distclean distclean-generic distclean-tags \
727699
distcleancheck distdir distuninstallcheck dvi dvi-am html \
728700
html-am info info-am install install-am install-data \
729701
install-data-am install-dvi install-dvi-am install-exec \
@@ -734,8 +706,6 @@ uninstall-am:
734706
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
735707
pdf-am ps ps-am tags tags-am uninstall uninstall-am
736708

737-
.PRECIOUS: Makefile
738-
739709

740710
# Tell versions [3.59,3.63) of GNU make to not export all variables.
741711
# Otherwise a system limit (for SysV at least) may be exceeded.

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ cost by a large factor compared to using the
4242

4343

4444
## Requirements
45-
`atools` requires at least Python 2.7.x, but only uses the standard
45+
`atools` requires at least Python 3.2, but only uses the standard
4646
library.
4747

4848
Currently, PBS torque, Adaptive Computing Moab, SUN Grid Engine and
49-
Slurm workload manager are supported.
49+
Slurm workload manager are supported. Slurm is the default, but
50+
that can be change during installation.
5051

5152

5253
## Installing

0 commit comments

Comments
 (0)