[PATCH] PerlMagick needlessly linked against libMagickWand

This is a multi-part message in MIME format.
--------------090106080805060904030702
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

PerlMagick is needlessly linked against libMagickWand. The attached
patch removes that dependency.

Nick

--------------090106080805060904030702
Content-Type: text/plain;
 name="perlmagick-wand.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="perlmagick-wand.diff"

Index: PerlMagick/Makefile.am
===================================================================
--- PerlMagick/Makefile.am	(revision 277)
+++ PerlMagick/Makefile.am	(working copy)
@@ -43,7 +43,7 @@
 
 if WITH_PERL_DYNAMIC
 
-$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(PERLMAKEMAKER)
 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
 
 install-exec-perl: $(PERLMAKEFILE)
@@ -69,10 +69,10 @@
 
 PERLMAGICK_CHECKSCRIPTS = perl-build
 
-$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(PERLMAKEMAKER)
 	cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS) && $(MAKE) Makefile ; $(MAKE) Makefile
 
-$(PERLMAGICK)/$(PERLSTATICNAME): $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
+$(PERLMAGICK)/$(PERLSTATICNAME): $(MAGICKCORE_LIBS) $(PERLMAKEFILE)
 	( rm -f $(PERLMAGICK)/$(PERLSTATICNAME) ; cd $(PERLMAGICK) && $(MAKE) CC='@CC@' $(PERLSTATICNAME) ; $(MAKE) CC='@CC@' $(PERLSTATICNAME) )
 
 all-perl: $(PERLMAGICK)/$(PERLSTATICNAME)
Index: PerlMagick/Makefile.PL.in
===================================================================
--- PerlMagick/Makefile.PL.in	(revision 277)
+++ PerlMagick/Makefile.PL.in	(working copy)
@@ -74,16 +74,16 @@
    #'LD' => $Config{'ld'} == $Config{'cc'} ? '@CC@' : $Config{'ld'},
 
    # Linker flags for building an executable
-   'LDFLAGS' =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} @LDFLAGS@",
+   'LDFLAGS' =>  "-L../magick/.libs -lMagickCore $Config{'ldflags'} @LDFLAGS@",
 
    # Linker flags for building a dynamically loadable module
-   'LDDLFLAGS' => "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'lddlflags'} @LDFLAGS@",
+   'LDDLFLAGS' => "-L../magick/.libs -lMagickCore $Config{'lddlflags'} @LDFLAGS@",
 
    # Install PerlMagick binary into ImageMagick bin directory
    'INSTALLBIN'	=> '@BIN_DIR@',
 
    # Library specification
-   'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
+   'LIBS' => [ '-L../magick/.libs -lMagickCore -lperl @MATH_LIBS@' ],
 
    # Perl binary name (if a Perl binary is built)
    'MAP_TARGET'	=> 'PerlMagick',

--------------090106080805060904030702
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Magick-developers mailing list
[email protected]
http://studio.imagemagick.org/mailman/listinfo/magick-developers

--------------090106080805060904030702--