Skip to content

Commit 96454f3

Browse files
author
Cristy
committed
latest autoconf/automake updates
1 parent f728367 commit 96454f3

File tree

14 files changed

+3539
-1470
lines changed

14 files changed

+3539
-1470
lines changed

MagickCache/Makefile.in

Lines changed: 24 additions & 16 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,
@@ -72,6 +72,8 @@ am__make_running_with_option = \
7272
test $$has_opt = yes
7373
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
7474
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
75+
am__rm_f = rm -f $(am__rm_f_notfound)
76+
am__rm_rf = rm -rf $(am__rm_f_notfound)
7577
pkgdatadir = $(datadir)/@PACKAGE@
7678
pkgincludedir = $(includedir)/@PACKAGE@
7779
pkglibdir = $(libdir)/@PACKAGE@
@@ -126,10 +128,9 @@ am__base_list = \
126128
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
127129
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
128130
am__uninstall_files_from_dir = { \
129-
test -z "$$files" \
130-
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
131-
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
132-
$(am__cd) "$$dir" && rm -f $$files; }; \
131+
{ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
132+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
133+
$(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
133134
}
134135
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
135136
"$(DESTDIR)$(pkgincludedir)"
@@ -318,8 +319,10 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
318319
am__include = @am__include@
319320
am__leading_dot = @am__leading_dot@
320321
am__quote = @am__quote@
322+
am__rm_f_notfound = @am__rm_f_notfound@
321323
am__tar = @am__tar@
322324
am__untar = @am__untar@
325+
am__xargs_n = @am__xargs_n@
323326
bindir = @bindir@
324327
build = @build@
325328
build_alias = @build_alias@
@@ -447,15 +450,13 @@ uninstall-libLTLIBRARIES:
447450
done
448451

449452
clean-libLTLIBRARIES:
450-
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
453+
-$(am__rm_f) $(lib_LTLIBRARIES)
451454
@list='$(lib_LTLIBRARIES)'; \
452455
locs=`for p in $$list; do echo $$p; done | \
453456
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
454457
sort -u`; \
455-
test -z "$$locs" || { \
456-
echo rm -f $${locs}; \
457-
rm -f $${locs}; \
458-
}
458+
echo rm -f $${locs}; \
459+
$(am__rm_f) $${locs}
459460

460461
libMagickCache.la: $(libMagickCache_la_OBJECTS) $(libMagickCache_la_DEPENDENCIES) $(EXTRA_libMagickCache_la_DEPENDENCIES)
461462
$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libMagickCache_la_OBJECTS) $(libMagickCache_la_LIBADD) $(LIBS)
@@ -471,7 +472,7 @@ distclean-compile:
471472

472473
$(am__depfiles_remade):
473474
@$(MKDIR_P) $(@D)
474-
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
475+
@: >>$@
475476

476477
am--depfiles: $(am__depfiles_remade)
477478

@@ -662,8 +663,8 @@ mostlyclean-generic:
662663
clean-generic:
663664

664665
distclean-generic:
665-
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
666-
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
666+
-$(am__rm_f) $(CONFIG_CLEAN_FILES)
667+
-test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
667668

668669
maintainer-clean-generic:
669670
@echo "This command is intended for maintainers to use"
@@ -674,7 +675,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
674675
mostlyclean-am
675676

676677
distclean: distclean-am
677-
-rm -f ./$(DEPDIR)/magick-cache.Plo
678+
-rm -f ./$(DEPDIR)/magick-cache.Plo
678679
-rm -f ./$(DEPDIR)/version.Plo
679680
-rm -f Makefile
680681
distclean-am: clean-am distclean-compile distclean-generic \
@@ -721,7 +722,7 @@ install-ps-am:
721722
installcheck-am:
722723

723724
maintainer-clean: maintainer-clean-am
724-
-rm -f ./$(DEPDIR)/magick-cache.Plo
725+
-rm -f ./$(DEPDIR)/magick-cache.Plo
725726
-rm -f ./$(DEPDIR)/version.Plo
726727
-rm -f Makefile
727728
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -766,3 +767,10 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
766767
# Tell versions [3.59,3.63) of GNU make to not export all variables.
767768
# Otherwise a system limit (for SysV at least) may be exceeded.
768769
.NOEXPORT:
770+
771+
# Tell GNU make to disable its built-in pattern rules.
772+
%:: %,v
773+
%:: RCS/%,v
774+
%:: RCS/%
775+
%:: s.%
776+
%:: SCCS/s.%

Makefile.in

Lines changed: 32 additions & 20 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,
@@ -70,6 +70,8 @@ am__make_running_with_option = \
7070
test $$has_opt = yes
7171
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
7272
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
73+
am__rm_f = rm -f $(am__rm_f_notfound)
74+
am__rm_rf = rm -rf $(am__rm_f_notfound)
7375
pkgdatadir = $(datadir)/@PACKAGE@
7476
pkgincludedir = $(includedir)/@PACKAGE@
7577
pkglibdir = $(libdir)/@PACKAGE@
@@ -126,10 +128,9 @@ am__base_list = \
126128
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
127129
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
128130
am__uninstall_files_from_dir = { \
129-
test -z "$$files" \
130-
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
131-
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
132-
$(am__cd) "$$dir" && rm -f $$files; }; \
131+
{ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
132+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
133+
$(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
133134
}
134135
am__installdirs = "$(DESTDIR)$(bindir)"
135136
SCRIPTS = $(bin_SCRIPTS)
@@ -196,8 +197,8 @@ distdir = $(PACKAGE)-$(VERSION)
196197
top_distdir = $(distdir)
197198
am__remove_distdir = \
198199
if test -d "$(distdir)"; then \
199-
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
200-
&& rm -rf "$(distdir)" \
200+
find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
201+
; rm -rf "$(distdir)" \
201202
|| { sleep 5 && rm -rf "$(distdir)"; }; \
202203
else :; fi
203204
am__post_remove_distdir = $(am__remove_distdir)
@@ -228,14 +229,16 @@ am__relativize = \
228229
reldir="$$dir2"
229230
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.lz \
230231
$(distdir).tar.xz $(distdir).zip
231-
GZIP_ENV = --best
232+
GZIP_ENV = -9
232233
DIST_TARGETS = dist-lzip dist-xz dist-bzip2 dist-gzip dist-zip
233234
# Exists only to be overridden by the user if desired.
234235
AM_DISTCHECK_DVI_TARGET = dvi
235236
distuninstallcheck_listfiles = find . -type f -print
236237
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
237238
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
238-
distcleancheck_listfiles = find . -type f -print
239+
distcleancheck_listfiles = \
240+
find . \( -type f -a \! \
241+
\( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
239242
ACLOCAL = @ACLOCAL@
240243
AMTAR = @AMTAR@
241244
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -347,8 +350,10 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
347350
am__include = @am__include@
348351
am__leading_dot = @am__leading_dot@
349352
am__quote = @am__quote@
353+
am__rm_f_notfound = @am__rm_f_notfound@
350354
am__tar = @am__tar@
351355
am__untar = @am__untar@
356+
am__xargs_n = @am__xargs_n@
352357
bindir = @bindir@
353358
build = @build@
354359
build_alias = @build_alias@
@@ -456,12 +461,12 @@ config.h: stamp-h1
456461
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
457462

458463
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
459-
@rm -f stamp-h1
460-
cd $(top_builddir) && $(SHELL) ./config.status config.h
464+
$(AM_V_at)rm -f stamp-h1
465+
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
461466
$(srcdir)/config.h.in: $(am__configure_deps)
462-
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
463-
rm -f stamp-h1
464-
touch $@
467+
$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
468+
$(AM_V_at)rm -f stamp-h1
469+
$(AM_V_at)touch $@
465470

466471
distclean-hdr:
467472
-rm -f config.h stamp-h1
@@ -622,7 +627,7 @@ distdir: $(BUILT_SOURCES)
622627

623628
distdir-am: $(DISTFILES)
624629
$(am__remove_distdir)
625-
test -d "$(distdir)" || mkdir "$(distdir)"
630+
$(AM_V_at)$(MKDIR_P) "$(distdir)"
626631
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
627632
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
628633
list='$(DISTFILES)'; \
@@ -729,7 +734,7 @@ dist dist-all:
729734
distcheck: dist
730735
case '$(DIST_ARCHIVES)' in \
731736
*.tar.gz*) \
732-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
737+
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
733738
*.tar.bz2*) \
734739
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
735740
*.tar.lz*) \
@@ -739,7 +744,7 @@ distcheck: dist
739744
*.tar.Z*) \
740745
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
741746
*.shar.gz*) \
742-
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
747+
eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
743748
*.zip*) \
744749
unzip $(distdir).zip ;;\
745750
*.tar.zst*) \
@@ -842,8 +847,8 @@ mostlyclean-generic:
842847
clean-generic:
843848

844849
distclean-generic:
845-
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
846-
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
850+
-$(am__rm_f) $(CONFIG_CLEAN_FILES)
851+
-test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
847852

848853
maintainer-clean-generic:
849854
@echo "This command is intended for maintainers to use"
@@ -944,3 +949,10 @@ uninstall-am: uninstall-binSCRIPTS
944949
# Tell versions [3.59,3.63) of GNU make to not export all variables.
945950
# Otherwise a system limit (for SysV at least) may be exceeded.
946951
.NOEXPORT:
952+
953+
# Tell GNU make to disable its built-in pattern rules.
954+
%:: %,v
955+
%:: RCS/%,v
956+
%:: RCS/%
957+
%:: s.%
958+
%:: SCCS/s.%

0 commit comments

Comments
 (0)