[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: TclMagick patch by Massimo Manghi to set AM_DIST...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2017-01-07 17:10:21
Message-ID: hg.be20577ab948.1483809021.2950750188400161634 () src ! simplesystems ! org
[Download RAW message or body]

changeset be20577ab948 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=be20577ab948
                
summary: TclMagick patch by Massimo Manghi to set AM_DISTCHECK_CONFIGURE_FLAGS and \
uninstall pkgIndex.tcl.

diffstat:

 ChangeLog             |  5 +++++
 TclMagick/ChangeLog   |  7 +++++++
 TclMagick/Makefile.am |  4 ++++
 TclMagick/Makefile.in |  9 +++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diffs (84 lines):

diff -r bbc49ed048f9 -r be20577ab948 ChangeLog
--- a/ChangeLog	Sat Jan 07 10:54:59 2017 -0600
+++ b/ChangeLog	Sat Jan 07 11:10:18 2017 -0600
@@ -1,5 +1,10 @@
 2017-01-07  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* TclMagick/Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Applied
+	patch by Massimo Manghi to set AM_DISTCHECK_CONFIGURE_FLAGS so
+	that 'make distcheck' remembers configuration options, and also to
+	uninstall pkgIndex.tcl.
+
 	* magick/image.c (SetImageEx): Use PixelIterateMonoSet() for
 	possibly improved efficiency.
 
diff -r bbc49ed048f9 -r be20577ab948 TclMagick/ChangeLog
--- a/TclMagick/ChangeLog	Sat Jan 07 10:54:59 2017 -0600
+++ b/TclMagick/ChangeLog	Sat Jan 07 11:10:18 2017 -0600
@@ -1,3 +1,10 @@
+2017-01-07  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Applied patch by
+	Massimo Manghi to set AM_DISTCHECK_CONFIGURE_FLAGS so that 'make
+	distcheck' remembers configuration options, and also to uninstall
+	pkgIndex.tcl.
+
 2016-12-31  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* generic/Makefile.am: Applied patch by Massimo Manghi (plus some
diff -r bbc49ed048f9 -r be20577ab948 TclMagick/Makefile.am
--- a/TclMagick/Makefile.am	Sat Jan 07 10:54:59 2017 -0600
+++ b/TclMagick/Makefile.am	Sat Jan 07 11:10:18 2017 -0600
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = 1.11 dist-zip dist-bzip2 foreign
 ACLOCAL_AMFLAGS = -I unix/m4
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} \
--with-magick=${wand_config} --exec-prefix=${prefix}  
 EXTRA_DIST=LICENSE tests images doc pkgIndex.tcl
 SUBDIRS = generic
@@ -7,3 +8,6 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)@libdir@/TclMagick@VERSION@
 	$(INSTALL_DATA) $(top_srcdir)/pkgIndex.tcl $(DESTDIR)@libdir@/TclMagick@VERSION@
+
+uninstall-local:
+	rm -v $(DESTDIR)@libdir@/TclMagick@VERSION@/pkgIndex.tcl
diff -r bbc49ed048f9 -r be20577ab948 TclMagick/Makefile.in
--- a/TclMagick/Makefile.in	Sat Jan 07 10:54:59 2017 -0600
+++ b/TclMagick/Makefile.in	Sat Jan 07 11:10:18 2017 -0600
@@ -296,6 +296,7 @@
 wand_config = @wand_config@
 AUTOMAKE_OPTIONS = 1.11 dist-zip dist-bzip2 foreign
 ACLOCAL_AMFLAGS = -I unix/m4
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-tk=${TK_BIN_DIR} \
--with-magick=${wand_config} --exec-prefix=${prefix}  EXTRA_DIST = LICENSE tests \
images doc pkgIndex.tcl  SUBDIRS = generic
 all: all-recursive
@@ -769,7 +770,7 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -788,13 +789,17 @@
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-local
 
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)@libdir@/TclMagick@VERSION@
 	$(INSTALL_DATA) $(top_srcdir)/pkgIndex.tcl $(DESTDIR)@libdir@/TclMagick@VERSION@
 
+uninstall-local:
+	rm -v $(DESTDIR)@libdir@/TclMagick@VERSION@/pkgIndex.tcl
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]