GraphicsMagick: TclMagick: Name installed TclMagick/TkMagick lib...
GraphicsMagick Commits <[email protected]> Mon, 28 Oct 2024 09:06:54 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.30536.1730124423.8001.graphicsmagick-commit@lists.sourceforge.net> |
changeset 5b87afae00c5 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5b87afae00c5 summary: TclMagick: Name installed TclMagick/TkMagick libraries similar to names generated by the TEA tcl.m4 module. diffstat: ChangeLog | 6 + TclMagick/ChangeLog | 6 + TclMagick/Makefile.am | 22 ++++-- TclMagick/Makefile.in | 100 +++++++++++++++++--------------- TclMagick/configure | 4 +- TclMagick/pkgIndex.tcl | 4 +- TclMagick/tests/test-wand.tcl | 2 +- VisualMagick/installer/inc/version.isx | 4 +- magick/version.h | 4 +- www/ChangeLog.html | 8 ++ 10 files changed, 96 insertions(+), 64 deletions(-) diffs (333 lines): diff -r 0e3ff1591e15 -r 5b87afae00c5 ChangeLog --- a/ChangeLog Sun Oct 27 10:41:49 2024 -0500 +++ b/ChangeLog Mon Oct 28 09:06:26 2024 -0500 @@ -1,3 +1,9 @@ +2024-10-28 Bob Friesenhahn <[email protected]> + + * TclMagick/Makefile.am: Name installed TclMagick/TkMagick + libraries similar to names generated by the TEA tcl.m4 module. + For example, name as TclMagick0.46.so and TkMagick0.46.so. + 2024-10-27 Bob Friesenhahn <[email protected]> * tests/{constitute.c, rwblob.c, rwfile.c}: Eliminate ugly diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/ChangeLog --- a/TclMagick/ChangeLog Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/ChangeLog Mon Oct 28 09:06:26 2024 -0500 @@ -1,3 +1,9 @@ +2024-10-28 Bob Friesenhahn <[email protected]> + + * Makefile.am: Name installed TclMagick/TkMagick libraries similar + to names generated by the TEA tcl.m4 module. For example, name as + TclMagick0.46.so and TkMagick0.46.so. + 2024-10-03 Bob Friesenhahn <[email protected]> * generic/TclMagickAppInit.c: Refresh implementation based on diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/Makefile.am --- a/TclMagick/Makefile.am Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/Makefile.am Mon Oct 28 09:06:26 2024 -0500 @@ -17,18 +17,22 @@ TCLSH = $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG) # Put this in its own package directory. +# +# See https://autotools.info/libtool/version.html "4.3. Multiple +# libraries versions" for how library version in name works with +# Automake generic_lib_magickdir = @libdir@/TclMagick@VERSION@ -generic_lib_magick_LTLIBRARIES = generic/TclMagick.la generic/TkMagick.la +generic_lib_magick_LTLIBRARIES = generic/TclMagick0.46.la generic/TkMagick0.46.la -generic_TclMagick_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h -generic_TclMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -generic_TclMagick_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ -generic_TclMagick_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ +generic_TclMagick0_46_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h +generic_TclMagick0_46_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -avoid-version +generic_TclMagick0_46_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ +generic_TclMagick0_46_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ -generic_TkMagick_la_SOURCES = generic/TkMagick.c generic/TclMagick.h generic/libttkcommon.h -generic_TkMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -generic_TkMagick_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @TK_LIB_SPEC@ @TK_LIBS@ @GM_LIBS@ -generic_TkMagick_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ @TK_INCLUDES@ @TK_XINCLUDES@ +generic_TkMagick0_46_la_SOURCES = generic/TkMagick.c generic/TclMagick.h generic/libttkcommon.h +generic_TkMagick0_46_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -avoid-version +generic_TkMagick0_46_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @TK_LIB_SPEC@ @TK_LIBS@ @GM_LIBS@ +generic_TkMagick0_46_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ @TK_INCLUDES@ @TK_XINCLUDES@ # A TclMagick executable (not installed) generic_PGMS = generic/TclMagick diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/Makefile.in --- a/TclMagick/Makefile.in Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/Makefile.in Mon Oct 28 09:06:26 2024 -0500 @@ -144,24 +144,28 @@ } am__installdirs = "$(DESTDIR)$(generic_lib_magickdir)" LTLIBRARIES = $(generic_lib_magick_LTLIBRARIES) -generic_TclMagick_la_DEPENDENCIES = +generic_TclMagick0_46_la_DEPENDENCIES = am__dirstamp = $(am__leading_dot)dirstamp -am_generic_TclMagick_la_OBJECTS = generic/TclMagick_la-TclMagick.lo -generic_TclMagick_la_OBJECTS = $(am_generic_TclMagick_la_OBJECTS) +am_generic_TclMagick0_46_la_OBJECTS = \ + generic/TclMagick0_46_la-TclMagick.lo +generic_TclMagick0_46_la_OBJECTS = \ + $(am_generic_TclMagick0_46_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -generic_TclMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +generic_TclMagick0_46_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(generic_TclMagick_la_LDFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) $(generic_TclMagick0_46_la_LDFLAGS) \ $(LDFLAGS) -o $@ -generic_TkMagick_la_DEPENDENCIES = -am_generic_TkMagick_la_OBJECTS = generic/TkMagick_la-TkMagick.lo -generic_TkMagick_la_OBJECTS = $(am_generic_TkMagick_la_OBJECTS) -generic_TkMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +generic_TkMagick0_46_la_DEPENDENCIES = +am_generic_TkMagick0_46_la_OBJECTS = \ + generic/TkMagick0_46_la-TkMagick.lo +generic_TkMagick0_46_la_OBJECTS = \ + $(am_generic_TkMagick0_46_la_OBJECTS) +generic_TkMagick0_46_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(generic_TkMagick_la_LDFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) $(generic_TkMagick0_46_la_LDFLAGS) \ $(LDFLAGS) -o $@ am_generic_TclMagick_OBJECTS = \ generic/TclMagick-TclMagickAppInit.$(OBJEXT) @@ -183,8 +187,8 @@ depcomp = $(SHELL) $(top_srcdir)/unix/config/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = generic/$(DEPDIR)/TclMagick-TclMagickAppInit.Po \ - generic/$(DEPDIR)/TclMagick_la-TclMagick.Plo \ - generic/$(DEPDIR)/TkMagick_la-TkMagick.Plo + generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Plo \ + generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -204,10 +208,12 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(generic_TclMagick_la_SOURCES) \ - $(generic_TkMagick_la_SOURCES) $(generic_TclMagick_SOURCES) -DIST_SOURCES = $(generic_TclMagick_la_SOURCES) \ - $(generic_TkMagick_la_SOURCES) $(generic_TclMagick_SOURCES) +SOURCES = $(generic_TclMagick0_46_la_SOURCES) \ + $(generic_TkMagick0_46_la_SOURCES) \ + $(generic_TclMagick_SOURCES) +DIST_SOURCES = $(generic_TclMagick0_46_la_SOURCES) \ + $(generic_TkMagick0_46_la_SOURCES) \ + $(generic_TclMagick_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -468,15 +474,15 @@ # Put this in its own package directory. generic_lib_magickdir = @libdir@/TclMagick@VERSION@ -generic_lib_magick_LTLIBRARIES = generic/TclMagick.la generic/TkMagick.la -generic_TclMagick_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h -generic_TclMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -generic_TclMagick_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ -generic_TclMagick_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ -generic_TkMagick_la_SOURCES = generic/TkMagick.c generic/TclMagick.h generic/libttkcommon.h -generic_TkMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -generic_TkMagick_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @TK_LIB_SPEC@ @TK_LIBS@ @GM_LIBS@ -generic_TkMagick_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ @TK_INCLUDES@ @TK_XINCLUDES@ +generic_lib_magick_LTLIBRARIES = generic/TclMagick0.46.la generic/TkMagick0.46.la +generic_TclMagick0_46_la_SOURCES = generic/TclMagick.c generic/TclMagick.h generic/libttkcommon.h +generic_TclMagick0_46_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -avoid-version +generic_TclMagick0_46_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TCL_LIBS@ @TCL_LIBS@ @GM_LIBS@ +generic_TclMagick0_46_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ +generic_TkMagick0_46_la_SOURCES = generic/TkMagick.c generic/TclMagick.h generic/libttkcommon.h +generic_TkMagick0_46_la_LDFLAGS = @GM_LDFLAGS@ -L$(generic_lib_magickdir) -no-undefined -module -avoid-version +generic_TkMagick0_46_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIB_SPEC@ @TCL_LIBS@ @TK_LIB_SPEC@ @TK_LIBS@ @GM_LIBS@ +generic_TkMagick0_46_la_CPPFLAGS = -Igeneric/ @TCL_INCLUDES@ @GM_CPPFLAGS@ @TK_INCLUDES@ @TK_XINCLUDES@ # A TclMagick executable (not installed) generic_PGMS = generic/TclMagick @@ -609,16 +615,16 @@ generic/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) generic/$(DEPDIR) @: > generic/$(DEPDIR)/$(am__dirstamp) -generic/TclMagick_la-TclMagick.lo: generic/$(am__dirstamp) \ +generic/TclMagick0_46_la-TclMagick.lo: generic/$(am__dirstamp) \ generic/$(DEPDIR)/$(am__dirstamp) -generic/TclMagick.la: $(generic_TclMagick_la_OBJECTS) $(generic_TclMagick_la_DEPENDENCIES) $(EXTRA_generic_TclMagick_la_DEPENDENCIES) generic/$(am__dirstamp) - $(AM_V_CCLD)$(generic_TclMagick_la_LINK) -rpath $(generic_lib_magickdir) $(generic_TclMagick_la_OBJECTS) $(generic_TclMagick_la_LIBADD) $(LIBS) -generic/TkMagick_la-TkMagick.lo: generic/$(am__dirstamp) \ +generic/TclMagick0.46.la: $(generic_TclMagick0_46_la_OBJECTS) $(generic_TclMagick0_46_la_DEPENDENCIES) $(EXTRA_generic_TclMagick0_46_la_DEPENDENCIES) generic/$(am__dirstamp) + $(AM_V_CCLD)$(generic_TclMagick0_46_la_LINK) -rpath $(generic_lib_magickdir) $(generic_TclMagick0_46_la_OBJECTS) $(generic_TclMagick0_46_la_LIBADD) $(LIBS) +generic/TkMagick0_46_la-TkMagick.lo: generic/$(am__dirstamp) \ generic/$(DEPDIR)/$(am__dirstamp) -generic/TkMagick.la: $(generic_TkMagick_la_OBJECTS) $(generic_TkMagick_la_DEPENDENCIES) $(EXTRA_generic_TkMagick_la_DEPENDENCIES) generic/$(am__dirstamp) - $(AM_V_CCLD)$(generic_TkMagick_la_LINK) -rpath $(generic_lib_magickdir) $(generic_TkMagick_la_OBJECTS) $(generic_TkMagick_la_LIBADD) $(LIBS) +generic/TkMagick0.46.la: $(generic_TkMagick0_46_la_OBJECTS) $(generic_TkMagick0_46_la_DEPENDENCIES) $(EXTRA_generic_TkMagick0_46_la_DEPENDENCIES) generic/$(am__dirstamp) + $(AM_V_CCLD)$(generic_TkMagick0_46_la_LINK) -rpath $(generic_lib_magickdir) $(generic_TkMagick0_46_la_OBJECTS) $(generic_TkMagick0_46_la_LIBADD) $(LIBS) generic/TclMagick-TclMagickAppInit.$(OBJEXT): generic/$(am__dirstamp) \ generic/$(DEPDIR)/$(am__dirstamp) @@ -635,8 +641,8 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/TclMagick-TclMagickAppInit.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/TclMagick_la-TclMagick.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/TkMagick_la-TkMagick.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Plo@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -668,19 +674,19 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -generic/TclMagick_la-TclMagick.lo: generic/TclMagick.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TclMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generic/TclMagick_la-TclMagick.lo -MD -MP -MF generic/$(DEPDIR)/TclMagick_la-TclMagick.Tpo -c -o generic/TclMagick_la-TclMagick.lo `test -f 'generic/TclMagick.c' || echo '$(srcdir)/'`generic/TclMagick.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) generic/$(DEPDIR)/TclMagick_la-TclMagick.Tpo generic/$(DEPDIR)/TclMagick_la-TclMagick.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/TclMagick.c' object='generic/TclMagick_la-TclMagick.lo' libtool=yes @AMDEPBACKSLASH@ +generic/TclMagick0_46_la-TclMagick.lo: generic/TclMagick.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TclMagick0_46_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generic/TclMagick0_46_la-TclMagick.lo -MD -MP -MF generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Tpo -c -o generic/TclMagick0_46_la-TclMagick.lo `test -f 'generic/TclMagick.c' || echo '$(srcdir)/'`generic/TclMagick.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Tpo generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/TclMagick.c' object='generic/TclMagick0_46_la-TclMagick.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TclMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generic/TclMagick_la-TclMagick.lo `test -f 'generic/TclMagick.c' || echo '$(srcdir)/'`generic/TclMagick.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TclMagick0_46_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generic/TclMagick0_46_la-TclMagick.lo `test -f 'generic/TclMagick.c' || echo '$(srcdir)/'`generic/TclMagick.c -generic/TkMagick_la-TkMagick.lo: generic/TkMagick.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TkMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generic/TkMagick_la-TkMagick.lo -MD -MP -MF generic/$(DEPDIR)/TkMagick_la-TkMagick.Tpo -c -o generic/TkMagick_la-TkMagick.lo `test -f 'generic/TkMagick.c' || echo '$(srcdir)/'`generic/TkMagick.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) generic/$(DEPDIR)/TkMagick_la-TkMagick.Tpo generic/$(DEPDIR)/TkMagick_la-TkMagick.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/TkMagick.c' object='generic/TkMagick_la-TkMagick.lo' libtool=yes @AMDEPBACKSLASH@ +generic/TkMagick0_46_la-TkMagick.lo: generic/TkMagick.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TkMagick0_46_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generic/TkMagick0_46_la-TkMagick.lo -MD -MP -MF generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Tpo -c -o generic/TkMagick0_46_la-TkMagick.lo `test -f 'generic/TkMagick.c' || echo '$(srcdir)/'`generic/TkMagick.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Tpo generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/TkMagick.c' object='generic/TkMagick0_46_la-TkMagick.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TkMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generic/TkMagick_la-TkMagick.lo `test -f 'generic/TkMagick.c' || echo '$(srcdir)/'`generic/TkMagick.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TkMagick0_46_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generic/TkMagick0_46_la-TkMagick.lo `test -f 'generic/TkMagick.c' || echo '$(srcdir)/'`generic/TkMagick.c generic/TclMagick-TclMagickAppInit.o: generic/TclMagickAppInit.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generic_TclMagick_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generic/TclMagick-TclMagickAppInit.o -MD -MP -MF generic/$(DEPDIR)/TclMagick-TclMagickAppInit.Tpo -c -o generic/TclMagick-TclMagickAppInit.o `test -f 'generic/TclMagickAppInit.c' || echo '$(srcdir)/'`generic/TclMagickAppInit.c @@ -982,8 +988,8 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f generic/$(DEPDIR)/TclMagick-TclMagickAppInit.Po - -rm -f generic/$(DEPDIR)/TclMagick_la-TclMagick.Plo - -rm -f generic/$(DEPDIR)/TkMagick_la-TkMagick.Plo + -rm -f generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Plo + -rm -f generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1033,8 +1039,8 @@ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -f generic/$(DEPDIR)/TclMagick-TclMagickAppInit.Po - -rm -f generic/$(DEPDIR)/TclMagick_la-TclMagick.Plo - -rm -f generic/$(DEPDIR)/TkMagick_la-TkMagick.Plo + -rm -f generic/$(DEPDIR)/TclMagick0_46_la-TclMagick.Plo + -rm -f generic/$(DEPDIR)/TkMagick0_46_la-TkMagick.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/configure --- a/TclMagick/configure Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/configure Mon Oct 28 09:06:26 2024 -0500 @@ -13031,6 +13031,8 @@ LDFLAGS=$LDFLAGS_SAVE LIBS=$LIBS_SAVE +# Specify the expected TEA_INIT version (matching TEA_VERSION in the tcl.m4 used). +# See https://core.tcl-lang.org/tcl/tktview/1703170fffffffffffff TEA_VERSION="3.13" @@ -13201,7 +13203,7 @@ - # Was 3.10 + diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/pkgIndex.tcl --- a/TclMagick/pkgIndex.tcl Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/pkgIndex.tcl Mon Oct 28 09:06:26 2024 -0500 @@ -1,9 +1,9 @@ # Hand-written package index file. package ifneeded TclMagick 0.46 " -[list load [file join $dir TclMagick[info sharedlibextension]]]" +[list load [file join $dir TclMagick0.46[info sharedlibextension]]]" package ifneeded TkMagick 0.46 " package require Tk package require TclMagick -[list load [file join $dir TkMagick[info sharedlibextension]]]" +[list load [file join $dir TkMagick0.46[info sharedlibextension]]]" diff -r 0e3ff1591e15 -r 5b87afae00c5 TclMagick/tests/test-wand.tcl --- a/TclMagick/tests/test-wand.tcl Sun Oct 27 10:41:49 2024 -0500 +++ b/TclMagick/tests/test-wand.tcl Mon Oct 28 09:06:26 2024 -0500 @@ -18,7 +18,7 @@ if {[file exists $dll]} { load $dll } - package require TclMagick + package require TclMagick0.46 } puts [info script] diff -r 0e3ff1591e15 -r 5b87afae00c5 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Sun Oct 27 10:41:49 2024 -0500 +++ b/VisualMagick/installer/inc/version.isx Mon Oct 28 09:06:26 2024 -0500 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020241027" -#define public MagickPackageReleaseDate "snapshot-20241027" +#define public MagickPackageVersionAddendum ".020241028" +#define public MagickPackageReleaseDate "snapshot-20241028" diff -r 0e3ff1591e15 -r 5b87afae00c5 magick/version.h --- a/magick/version.h Sun Oct 27 10:41:49 2024 -0500 +++ b/magick/version.h Mon Oct 28 09:06:26 2024 -0500 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x282502 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 28,25,2 -#define MagickChangeDate "20241027" -#define MagickReleaseDate "snapshot-20241027" +#define MagickChangeDate "20241028" +#define MagickReleaseDate "snapshot-20241028" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 0e3ff1591e15 -r 5b87afae00c5 www/ChangeLog.html --- a/www/ChangeLog.html Sun Oct 27 10:41:49 2024 -0500 +++ b/www/ChangeLog.html Mon Oct 28 09:06:26 2024 -0500 @@ -38,6 +38,14 @@ <main id="graphicsmagick-changelog"> <h1 class="title">GraphicsMagick ChangeLog</h1> +<p>2024-10-28 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>TclMagick/Makefile.am: Name installed TclMagick/TkMagick +libraries similar to names generated by the TEA tcl.m4 module. +For example, name as TclMagick0.46.so and TkMagick0.46.so.</p></li> +</ul> +</blockquote> <p>2024-10-27 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple">