Skip to content

Commit 4e84775

Browse files
kstrauserkstrauser
committed
Tooling update
1 parent e53ae6a commit 4e84775

File tree

4 files changed

+68
-34
lines changed

4 files changed

+68
-34
lines changed

‎Makefile.in

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

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2017 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,
@@ -15,7 +15,17 @@
1515
@SET_MAKE@
1616

1717
VPATH = @srcdir@
18-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18+
am__is_gnu_make = { \
19+
if test -z '$(MAKELEVEL)'; then \
20+
false; \
21+
elif test -n '$(MAKE_HOST)'; then \
22+
true; \
23+
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24+
true; \
25+
else \
26+
false; \
27+
fi; \
28+
}
1929
am__make_running_with_option = \
2030
case $${target_option-} in \
2131
?) ;; \
@@ -79,17 +89,14 @@ POST_UNINSTALL = :
7989
build_triplet = @build@
8090
host_triplet = @host@
8191
subdir = .
82-
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83-
$(top_srcdir)/configure $(am__configure_deps) \
84-
$(srcdir)/config.h.in $(dist_doc_DATA) COPYING compile \
85-
config.guess config.rpath config.sub depcomp install-sh \
86-
missing
8792
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8893
am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
8994
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
9095
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.ac
9196
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9297
$(ACLOCAL_M4)
98+
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
99+
$(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
93100
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
94101
configure.lineno config.status.lineno
95102
mkinstalldirs = $(install_sh) -d
@@ -182,6 +189,9 @@ ETAGS = etags
182189
CTAGS = ctags
183190
CSCOPE = cscope
184191
DIST_SUBDIRS = $(SUBDIRS)
192+
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
193+
compile config.guess config.rpath config.sub depcomp \
194+
install-sh missing
185195
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
186196
distdir = $(PACKAGE)-$(VERSION)
187197
top_distdir = $(distdir)
@@ -322,7 +332,7 @@ top_build_prefix = @top_build_prefix@
322332
top_builddir = @top_builddir@
323333
top_srcdir = @top_srcdir@
324334
SUBDIRS = doc src
325-
dist_doc_DATA = README.mdown
335+
dist_doc_DATA = README.md
326336
ACLOCAL_AMFLAGS = -I m4 --install
327337
all: config.h
328338
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -343,7 +353,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
343353
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
344354
$(am__cd) $(top_srcdir) && \
345355
$(AUTOMAKE) --foreign Makefile
346-
.PRECIOUS: Makefile
347356
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
348357
@case '$?' in \
349358
*config.status*) \
@@ -570,7 +579,7 @@ distdir: $(DISTFILES)
570579
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
571580
|| chmod -R a+r "$(distdir)"
572581
dist-gzip: distdir
573-
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
582+
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
574583
$(am__post_remove_distdir)
575584

576585
dist-bzip2: distdir
@@ -586,17 +595,17 @@ dist-xz: distdir
586595
$(am__post_remove_distdir)
587596

588597
dist-tarZ: distdir
589-
@echo WARNING: "Support for shar distribution archives is" \
590-
"deprecated." >&2
598+
@echo WARNING: "Support for distribution archives compressed with" \
599+
"legacy program 'compress' is deprecated." >&2
591600
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
592601
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
593602
$(am__post_remove_distdir)
594603

595604
dist-shar: distdir
596-
@echo WARNING: "Support for distribution archives compressed with" \
597-
"legacy program 'compress' is deprecated." >&2
605+
@echo WARNING: "Support for shar distribution archives is" \
606+
"deprecated." >&2
598607
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
599-
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
608+
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
600609
$(am__post_remove_distdir)
601610

602611
dist-zip: distdir
@@ -614,7 +623,7 @@ dist dist-all:
614623
distcheck: dist
615624
case '$(DIST_ARCHIVES)' in \
616625
*.tar.gz*) \
617-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
626+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
618627
*.tar.bz2*) \
619628
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
620629
*.tar.lz*) \
@@ -624,22 +633,23 @@ distcheck: dist
624633
*.tar.Z*) \
625634
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
626635
*.shar.gz*) \
627-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
636+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
628637
*.zip*) \
629638
unzip $(distdir).zip ;;\
630639
esac
631640
chmod -R a-w $(distdir)
632641
chmod u+w $(distdir)
633-
mkdir $(distdir)/_build $(distdir)/_inst
642+
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
634643
chmod a-w $(distdir)
635644
test -d $(distdir)/_build || exit 0; \
636645
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
637646
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
638647
&& am__cwd=`pwd` \
639-
&& $(am__cd) $(distdir)/_build \
640-
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
648+
&& $(am__cd) $(distdir)/_build/sub \
649+
&& ../../configure \
641650
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
642651
$(DISTCHECK_CONFIGURE_FLAGS) \
652+
--srcdir=../.. --prefix="$$dc_install_base" \
643653
&& $(MAKE) $(AM_MAKEFLAGS) \
644654
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
645655
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -817,6 +827,8 @@ uninstall-am: uninstall-dist_docDATA
817827
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
818828
tags-am uninstall uninstall-am uninstall-dist_docDATA
819829

830+
.PRECIOUS: Makefile
831+
820832

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

‎compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/usr/local/Cellar/automake/1.14/share/automake-1.14/compile
1+
/usr/local/Cellar/automake/1.15.1/share/automake-1.15/compile

‎doc/Makefile.in

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.14 from Makefile.am.
1+
# Makefile.in generated by automake 1.15.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2017 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,7 +14,17 @@
1414

1515
@SET_MAKE@
1616
VPATH = @srcdir@
17-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
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+
}
1828
am__make_running_with_option = \
1929
case $${target_option-} in \
2030
?) ;; \
@@ -78,14 +88,13 @@ POST_UNINSTALL = :
7888
build_triplet = @build@
7989
host_triplet = @host@
8090
subdir = doc
81-
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
82-
$(dist_man1_MANS)
8391
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8492
am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
8593
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
8694
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.ac
8795
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8896
$(ACLOCAL_M4)
97+
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
8998
mkinstalldirs = $(install_sh) -d
9099
CONFIG_HEADER = $(top_builddir)/config.h
91100
CONFIG_CLEAN_FILES =
@@ -141,6 +150,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)"
141150
NROFF = nroff
142151
MANS = $(dist_man1_MANS)
143152
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
153+
am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in
144154
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
145155
ACLOCAL = @ACLOCAL@
146156
AMTAR = @AMTAR@
@@ -255,7 +265,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
255265
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
256266
$(am__cd) $(top_srcdir) && \
257267
$(AUTOMAKE) --foreign doc/Makefile
258-
.PRECIOUS: Makefile
259268
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
260269
@case '$?' in \
261270
*config.status*) \
@@ -470,6 +479,8 @@ uninstall-man: uninstall-man1
470479
pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \
471480
uninstall-man1
472481

482+
.PRECIOUS: Makefile
483+
473484

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

‎src/Makefile.in

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.14 from Makefile.am.
1+
# Makefile.in generated by automake 1.15.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2017 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,
@@ -15,7 +15,17 @@
1515
@SET_MAKE@
1616

1717
VPATH = @srcdir@
18-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18+
am__is_gnu_make = { \
19+
if test -z '$(MAKELEVEL)'; then \
20+
false; \
21+
elif test -n '$(MAKE_HOST)'; then \
22+
true; \
23+
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24+
true; \
25+
else \
26+
false; \
27+
fi; \
28+
}
1929
am__make_running_with_option = \
2030
case $${target_option-} in \
2131
?) ;; \
@@ -80,14 +90,13 @@ build_triplet = @build@
8090
host_triplet = @host@
8191
bin_PROGRAMS = pgdbf$(EXEEXT)
8292
subdir = src
83-
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84-
$(top_srcdir)/depcomp
8593
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8694
am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
8795
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
8896
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.ac
8997
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9098
$(ACLOCAL_M4)
99+
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
91100
mkinstalldirs = $(install_sh) -d
92101
CONFIG_HEADER = $(top_builddir)/config.h
93102
CONFIG_CLEAN_FILES =
@@ -151,6 +160,7 @@ am__define_uniq_tagged_files = \
151160
done | $(am__uniquify_input)`
152161
ETAGS = etags
153162
CTAGS = ctags
163+
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
154164
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
155165
ACLOCAL = @ACLOCAL@
156166
AMTAR = @AMTAR@
@@ -267,7 +277,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
267277
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
268278
$(am__cd) $(top_srcdir) && \
269279
$(AUTOMAKE) --foreign src/Makefile
270-
.PRECIOUS: Makefile
271280
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
272281
@case '$?' in \
273282
*config.status*) \
@@ -558,6 +567,8 @@ uninstall-am: uninstall-binPROGRAMS
558567
ps ps-am tags tags-am uninstall uninstall-am \
559568
uninstall-binPROGRAMS
560569

570+
.PRECIOUS: Makefile
571+
561572

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

0 commit comments

Comments
 (0)