Skip to content

Commit 155d986

Browse files
author
Serge Lamikhov-Center
committed
Preparation to release 3.5
1 parent 6462660 commit 155d986

File tree

10 files changed

+330
-273
lines changed

10 files changed

+330
-273
lines changed

Makefile.in

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2018 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,
@@ -162,7 +162,7 @@ am__recursive_targets = \
162162
$(RECURSIVE_CLEAN_TARGETS) \
163163
$(am__extra_recursive_targets)
164164
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
165-
cscope distdir dist dist-all distcheck
165+
cscope distdir distdir-am dist dist-all distcheck
166166
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
167167
# Read a list of newline-separated strings from the standard input,
168168
# and print each of them once, without duplicates. Input order is
@@ -346,8 +346,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
346346
echo ' $(SHELL) ./config.status'; \
347347
$(SHELL) ./config.status;; \
348348
*) \
349-
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
350-
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
349+
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
350+
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
351351
esac;
352352

353353
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -489,7 +489,10 @@ distclean-tags:
489489
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
490490
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
491491

492-
distdir: $(DISTFILES)
492+
distdir: $(BUILT_SOURCES)
493+
$(MAKE) $(AM_MAKEFLAGS) distdir-am
494+
495+
distdir-am: $(DISTFILES)
493496
$(am__remove_distdir)
494497
test -d "$(distdir)" || mkdir "$(distdir)"
495498
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -557,7 +560,7 @@ distdir: $(DISTFILES)
557560
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
558561
|| chmod -R a+r "$(distdir)"
559562
dist-gzip: distdir
560-
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
563+
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
561564
$(am__post_remove_distdir)
562565

563566
dist-bzip2: distdir
@@ -583,7 +586,7 @@ dist-shar: distdir
583586
@echo WARNING: "Support for shar distribution archives is" \
584587
"deprecated." >&2
585588
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
586-
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
589+
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
587590
$(am__post_remove_distdir)
588591

589592
dist-zip: distdir
@@ -601,7 +604,7 @@ dist dist-all:
601604
distcheck: dist
602605
case '$(DIST_ARCHIVES)' in \
603606
*.tar.gz*) \
604-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
607+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
605608
*.tar.bz2*) \
606609
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
607610
*.tar.lz*) \
@@ -611,7 +614,7 @@ distcheck: dist
611614
*.tar.Z*) \
612615
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
613616
*.shar.gz*) \
614-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
617+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
615618
*.zip*) \
616619
unzip $(distdir).zip ;;\
617620
esac

0 commit comments

Comments
 (0)