Skip to content

Commit 3aca4f0

Browse files
author
Cristy
committed
latest automake/autoconf updated
1 parent e8a4f29 commit 3aca4f0

20 files changed

+3988
-1835
lines changed

Makefile

Lines changed: 106 additions & 75 deletions
Large diffs are not rendered by default.

Makefile.in

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

4-
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2024 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,
@@ -170,6 +170,8 @@ am__make_running_with_option = \
170170
test $$has_opt = yes
171171
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
172172
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
173+
am__rm_f = rm -f $(am__rm_f_notfound)
174+
am__rm_rf = rm -rf $(am__rm_f_notfound)
173175
pkgdatadir = $(datadir)/@PACKAGE@
174176
pkgincludedir = $(includedir)/@PACKAGE@
175177
pkglibdir = $(libdir)/@PACKAGE@
@@ -262,10 +264,9 @@ am__base_list = \
262264
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
263265
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
264266
am__uninstall_files_from_dir = { \
265-
test -z "$$files" \
266-
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
267-
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
268-
$(am__cd) "$$dir" && rm -f $$files; }; \
267+
{ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
268+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
269+
$(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
269270
}
270271
LTLIBRARIES = $(lib_LTLIBRARIES)
271272
am__DEPENDENCIES_1 =
@@ -592,6 +593,7 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac
592593
# Default flags passed to test drivers.
593594
am__common_driver_flags = \
594595
--color-tests "$$am__color_tests" \
596+
$$am__collect_skipped_logs \
595597
--enable-hard-errors "$$am__enable_hard_errors" \
596598
--expect-failure "$$am__expect_failure"
597599
# To be inserted before the command running the test. Creates the
@@ -616,6 +618,11 @@ if test -f "./$$f"; then dir=./; \
616618
elif test -f "$$f"; then dir=; \
617619
else dir="$(srcdir)/"; fi; \
618620
tst=$$dir$$f; log='$@'; \
621+
if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
622+
am__collect_skipped_logs='--collect-skipped-logs no'; \
623+
else \
624+
am__collect_skipped_logs=''; \
625+
fi; \
619626
if test -n '$(DISABLE_HARD_ERRORS)'; then \
620627
am__enable_hard_errors=no; \
621628
else \
@@ -693,21 +700,23 @@ distdir = $(PACKAGE)-$(VERSION)
693700
top_distdir = $(distdir)
694701
am__remove_distdir = \
695702
if test -d "$(distdir)"; then \
696-
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
697-
&& rm -rf "$(distdir)" \
703+
find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
704+
; rm -rf "$(distdir)" \
698705
|| { sleep 5 && rm -rf "$(distdir)"; }; \
699706
else :; fi
700707
am__post_remove_distdir = $(am__remove_distdir)
701708
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.lz \
702709
$(distdir).tar.xz $(distdir).zip
703-
GZIP_ENV = --best
710+
GZIP_ENV = -9
704711
DIST_TARGETS = dist-lzip dist-xz dist-bzip2 dist-gzip dist-zip
705712
# Exists only to be overridden by the user if desired.
706713
AM_DISTCHECK_DVI_TARGET = dvi
707714
distuninstallcheck_listfiles = find . -type f -print
708715
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
709716
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
710-
distcleancheck_listfiles = find . -type f -print
717+
distcleancheck_listfiles = \
718+
find . \( -type f -a \! \
719+
\( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
711720
ACLOCAL = @ACLOCAL@
712721
AMTAR = @AMTAR@
713722
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -911,8 +920,10 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
911920
am__include = @am__include@
912921
am__leading_dot = @am__leading_dot@
913922
am__quote = @am__quote@
923+
am__rm_f_notfound = @am__rm_f_notfound@
914924
am__tar = @am__tar@
915925
am__untar = @am__untar@
926+
am__xargs_n = @am__xargs_n@
916927
ax_pthread_config = @ax_pthread_config@
917928
bindir = @bindir@
918929
build = @build@
@@ -1517,12 +1528,12 @@ config/config.h: config/stamp-h1
15171528
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1
15181529

15191530
config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status
1520-
@rm -f config/stamp-h1
1521-
cd $(top_builddir) && $(SHELL) ./config.status config/config.h
1531+
$(AM_V_at)rm -f config/stamp-h1
1532+
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config/config.h
15221533
$(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1523-
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
1524-
rm -f config/stamp-h1
1525-
touch $@
1534+
$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
1535+
$(AM_V_at)rm -f config/stamp-h1
1536+
$(AM_V_at)touch $@
15261537

15271538
distclean-hdr:
15281539
-rm -f config/config.h config/stamp-h1
@@ -1593,25 +1604,15 @@ uninstall-binPROGRAMS:
15931604
`; \
15941605
test -n "$$list" || exit 0; \
15951606
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
1596-
cd "$(DESTDIR)$(bindir)" && rm -f $$files
1607+
cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
15971608

15981609
clean-binPROGRAMS:
1599-
@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
1600-
echo " rm -f" $$list; \
1601-
rm -f $$list || exit $$?; \
1602-
test -n "$(EXEEXT)" || exit 0; \
1603-
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
1604-
echo " rm -f" $$list; \
1605-
rm -f $$list
1610+
$(am__rm_f) $(bin_PROGRAMS)
1611+
test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
16061612

16071613
clean-checkPROGRAMS:
1608-
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
1609-
echo " rm -f" $$list; \
1610-
rm -f $$list || exit $$?; \
1611-
test -n "$(EXEEXT)" || exit 0; \
1612-
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
1613-
echo " rm -f" $$list; \
1614-
rm -f $$list
1614+
$(am__rm_f) $(check_PROGRAMS)
1615+
test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
16151616

16161617
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
16171618
@$(NORMAL_INSTALL)
@@ -1638,21 +1639,19 @@ uninstall-libLTLIBRARIES:
16381639
done
16391640

16401641
clean-libLTLIBRARIES:
1641-
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
1642+
-$(am__rm_f) $(lib_LTLIBRARIES)
16421643
@list='$(lib_LTLIBRARIES)'; \
16431644
locs=`for p in $$list; do echo $$p; done | \
16441645
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
16451646
sort -u`; \
1646-
test -z "$$locs" || { \
1647-
echo rm -f $${locs}; \
1648-
rm -f $${locs}; \
1649-
}
1647+
echo rm -f $${locs}; \
1648+
$(am__rm_f) $${locs}
16501649
wizard/$(am__dirstamp):
16511650
@$(MKDIR_P) wizard
1652-
@: > wizard/$(am__dirstamp)
1651+
@: >>wizard/$(am__dirstamp)
16531652
wizard/$(DEPDIR)/$(am__dirstamp):
16541653
@$(MKDIR_P) wizard/$(DEPDIR)
1655-
@: > wizard/$(DEPDIR)/$(am__dirstamp)
1654+
@: >>wizard/$(DEPDIR)/$(am__dirstamp)
16561655
wizard/aes.lo: wizard/$(am__dirstamp) wizard/$(DEPDIR)/$(am__dirstamp)
16571656
wizard/authenticate.lo: wizard/$(am__dirstamp) \
16581657
wizard/$(DEPDIR)/$(am__dirstamp)
@@ -1755,10 +1754,10 @@ wizard/libWizardsToolkit.la: $(wizard_libWizardsToolkit_la_OBJECTS) $(wizard_lib
17551754
$(AM_V_CCLD)$(wizard_libWizardsToolkit_la_LINK) -rpath $(libdir) $(wizard_libWizardsToolkit_la_OBJECTS) $(wizard_libWizardsToolkit_la_LIBADD) $(LIBS)
17561755
tests/$(am__dirstamp):
17571756
@$(MKDIR_P) tests
1758-
@: > tests/$(am__dirstamp)
1757+
@: >>tests/$(am__dirstamp)
17591758
tests/$(DEPDIR)/$(am__dirstamp):
17601759
@$(MKDIR_P) tests/$(DEPDIR)
1761-
@: > tests/$(DEPDIR)/$(am__dirstamp)
1760+
@: >>tests/$(DEPDIR)/$(am__dirstamp)
17621761
tests/validate-validate.$(OBJEXT): tests/$(am__dirstamp) \
17631762
tests/$(DEPDIR)/$(am__dirstamp)
17641763

@@ -1767,10 +1766,10 @@ tests/validate$(EXEEXT): $(tests_validate_OBJECTS) $(tests_validate_DEPENDENCIES
17671766
$(AM_V_CCLD)$(LINK) $(tests_validate_OBJECTS) $(tests_validate_LDADD) $(LIBS)
17681767
utilities/$(am__dirstamp):
17691768
@$(MKDIR_P) utilities
1770-
@: > utilities/$(am__dirstamp)
1769+
@: >>utilities/$(am__dirstamp)
17711770
utilities/$(DEPDIR)/$(am__dirstamp):
17721771
@$(MKDIR_P) utilities/$(DEPDIR)
1773-
@: > utilities/$(DEPDIR)/$(am__dirstamp)
1772+
@: >>utilities/$(DEPDIR)/$(am__dirstamp)
17741773
utilities/cipher-info.$(OBJEXT): utilities/$(am__dirstamp) \
17751774
utilities/$(DEPDIR)/$(am__dirstamp)
17761775
utilities/content.$(OBJEXT): utilities/$(am__dirstamp) \
@@ -1913,7 +1912,7 @@ distclean-compile:
19131912

19141913
$(am__depfiles_remade):
19151914
@$(MKDIR_P) $(@D)
1916-
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
1915+
@: >>$@
19171916

19181917
am--depfiles: $(am__depfiles_remade)
19191918

@@ -2229,7 +2228,6 @@ distclean-tags:
22292228
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
22302229
am--force-recheck:
22312230
@:
2232-
22332231
$(TEST_SUITE_LOG): $(TEST_LOGS)
22342232
@$(am__set_TESTS_bases); \
22352233
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -2305,10 +2303,37 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
23052303
result_count $$1 "XPASS:" $$xpass "$$red"; \
23062304
result_count $$1 "ERROR:" $$error "$$mgn"; \
23072305
}; \
2306+
output_system_information () \
2307+
{ \
2308+
echo; \
2309+
{ uname -a | $(AWK) '{ \
2310+
printf "System information (uname -a):"; \
2311+
for (i = 1; i < NF; ++i) \
2312+
{ \
2313+
if (i != 2) \
2314+
printf " %s", $$i; \
2315+
} \
2316+
printf "\n"; \
2317+
}'; } 2>&1; \
2318+
if test -r /etc/os-release; then \
2319+
echo "Distribution information (/etc/os-release):"; \
2320+
sed 8q /etc/os-release; \
2321+
elif test -r /etc/issue; then \
2322+
echo "Distribution information (/etc/issue):"; \
2323+
cat /etc/issue; \
2324+
fi; \
2325+
}; \
2326+
please_report () \
2327+
{ \
2328+
echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
2329+
echo "together with the test-suite.log file (gzipped) and your system"; \
2330+
echo "information. Thanks."; \
2331+
}; \
23082332
{ \
23092333
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
23102334
$(am__rst_title); \
23112335
create_testsuite_report --no-color; \
2336+
output_system_information; \
23122337
echo; \
23132338
echo ".. contents:: :depth: 2"; \
23142339
echo; \
@@ -2328,26 +2353,25 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
23282353
create_testsuite_report --maybe-color; \
23292354
echo "$$col$$br$$std"; \
23302355
if $$success; then :; else \
2331-
echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
2356+
echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
23322357
if test -n "$(PACKAGE_BUGREPORT)"; then \
2333-
echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
2358+
please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
23342359
fi; \
23352360
echo "$$col$$br$$std"; \
23362361
fi; \
23372362
$$success || exit 1
23382363

23392364
check-TESTS: $(check_PROGRAMS)
2340-
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
2341-
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
2342-
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2365+
@$(am__rm_f) $(RECHECK_LOGS)
2366+
@$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
2367+
@$(am__rm_f) $(TEST_SUITE_LOG)
23432368
@set +e; $(am__set_TESTS_bases); \
23442369
log_list=`for i in $$bases; do echo $$i.log; done`; \
2345-
trs_list=`for i in $$bases; do echo $$i.trs; done`; \
2346-
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
2370+
log_list=`echo $$log_list`; \
23472371
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
23482372
exit $$?;
23492373
recheck: all $(check_PROGRAMS)
2350-
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2374+
@$(am__rm_f) $(TEST_SUITE_LOG)
23512375
@set +e; $(am__set_TESTS_bases); \
23522376
bases=`for i in $$bases; do echo $$i; done \
23532377
| $(am__list_recheck_tests)` || exit 1; \
@@ -2390,7 +2414,7 @@ distdir: $(BUILT_SOURCES)
23902414

23912415
distdir-am: $(DISTFILES)
23922416
$(am__remove_distdir)
2393-
test -d "$(distdir)" || mkdir "$(distdir)"
2417+
$(AM_V_at)$(MKDIR_P) "$(distdir)"
23942418
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
23952419
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
23962420
list='$(DISTFILES)'; \
@@ -2475,7 +2499,7 @@ dist dist-all:
24752499
distcheck: dist
24762500
case '$(DIST_ARCHIVES)' in \
24772501
*.tar.gz*) \
2478-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
2502+
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
24792503
*.tar.bz2*) \
24802504
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
24812505
*.tar.lz*) \
@@ -2485,7 +2509,7 @@ distcheck: dist
24852509
*.tar.Z*) \
24862510
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
24872511
*.shar.gz*) \
2488-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
2512+
eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
24892513
*.zip*) \
24902514
unzip $(distdir).zip ;;\
24912515
*.tar.zst*) \
@@ -2590,23 +2614,23 @@ install-strip:
25902614
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
25912615
fi
25922616
mostlyclean-generic:
2593-
-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
2594-
-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
2595-
-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
2617+
-$(am__rm_f) $(TEST_LOGS)
2618+
-$(am__rm_f) $(TEST_LOGS:.log=.trs)
2619+
-$(am__rm_f) $(TEST_SUITE_LOG)
25962620

25972621
clean-generic:
2598-
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
2622+
-$(am__rm_f) $(CLEANFILES)
25992623

26002624
distclean-generic:
2601-
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2602-
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2603-
-rm -f tests/$(DEPDIR)/$(am__dirstamp)
2604-
-rm -f tests/$(am__dirstamp)
2605-
-rm -f utilities/$(DEPDIR)/$(am__dirstamp)
2606-
-rm -f utilities/$(am__dirstamp)
2607-
-rm -f wizard/$(DEPDIR)/$(am__dirstamp)
2608-
-rm -f wizard/$(am__dirstamp)
2609-
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
2625+
-$(am__rm_f) $(CONFIG_CLEAN_FILES)
2626+
-test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
2627+
-$(am__rm_f) $(DISTCLEANFILES)
2628+
-$(am__rm_f) tests/$(DEPDIR)/$(am__dirstamp)
2629+
-$(am__rm_f) tests/$(am__dirstamp)
2630+
-$(am__rm_f) utilities/$(DEPDIR)/$(am__dirstamp)
2631+
-$(am__rm_f) utilities/$(am__dirstamp)
2632+
-$(am__rm_f) wizard/$(DEPDIR)/$(am__dirstamp)
2633+
-$(am__rm_f) wizard/$(am__dirstamp)
26102634

26112635
maintainer-clean-generic:
26122636
@echo "This command is intended for maintainers to use"
@@ -2618,7 +2642,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
26182642

26192643
distclean: distclean-am
26202644
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
2621-
-rm -f tests/$(DEPDIR)/validate-validate.Po
2645+
-rm -f tests/$(DEPDIR)/validate-validate.Po
26222646
-rm -f utilities/$(DEPDIR)/cipher-info.Po
26232647
-rm -f utilities/$(DEPDIR)/content.Po
26242648
-rm -f utilities/$(DEPDIR)/decipher.Po
@@ -2728,7 +2752,7 @@ installcheck-am:
27282752
maintainer-clean: maintainer-clean-am
27292753
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
27302754
-rm -rf $(top_srcdir)/autom4te.cache
2731-
-rm -f tests/$(DEPDIR)/validate-validate.Po
2755+
-rm -f tests/$(DEPDIR)/validate-validate.Po
27322756
-rm -f utilities/$(DEPDIR)/cipher-info.Po
27332757
-rm -f utilities/$(DEPDIR)/content.Po
27342758
-rm -f utilities/$(DEPDIR)/decipher.Po
@@ -2963,3 +2987,10 @@ snapshot: distcheck
29632987
# Tell versions [3.59,3.63) of GNU make to not export all variables.
29642988
# Otherwise a system limit (for SysV at least) may be exceeded.
29652989
.NOEXPORT:
2990+
2991+
# Tell GNU make to disable its built-in pattern rules.
2992+
%:: %,v
2993+
%:: RCS/%,v
2994+
%:: RCS/%
2995+
%:: s.%
2996+
%:: SCCS/s.%

0 commit comments

Comments
 (0)