[csw-devel] SF.net SVN: gar:[21509] csw/mgar/pkg/ImageMagick/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 21509
          http://gar.svn.sourceforge.net/gar/?rev=21509&view=rev
Author:   lblume
Date:     2013-07-15 07:53:26 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
ImageMagick/trunk: Redefine the magick++ library package

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2013-07-14 20:04:55 UTC (rev 21508)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2013-07-15 07:53:26 UTC (rev 21509)
@@ -66,6 +66,14 @@
 PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1
 
+PACKAGES += CSWlibmagick++6q16hdri1
+CATALOGNAME_CSWlibmagick++6q16hdri1 = libmagick++6q16hdri1
+PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1\.0\.0)
+PKGFILES_CSWlibmagick++6q16hdri1 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibmagick++6q16hdri1 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.1
+RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickcore6q16hdri1
+RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri1 += CSWlibmagickwand6q16hdri1
+
 PACKAGES += CSWimagemagick-dev
 SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries
 # In man3 there is just the manpage for the Perl module
@@ -75,6 +83,7 @@
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri1
 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl
 
 PACKAGES += CSWimagemagick
@@ -117,7 +126,8 @@
 
 EXTRA_LINKER_FLAGS = -Bdirect -norunpath -lsocket -lnsl
 EXTRA_LD_OPTIONS = -z nolazyload
-EXTRA_CFLAGS = -xc99 -norunpath
+EXTRA_CFLAGS   = -xc99 -norunpath
+EXTRA_CXXFLAGS = -xnorunpath
 
 # We especially don't want ISALIST for the above /usr/openwin/lib
 # This should be reworked after a general rework of ISALIST in GAR
@@ -131,9 +141,6 @@
 # This one causes the Q16HDR in the lib name
 CONFIGURE_ARGS += --enable-hdri
 
-# At this point, adding the C++ bits might cause more grief than good
-CONFIGURE_ARGS += --without-magick-plus-plus
-
 # For some reason, on x86, DPS is only available as a 32 bit lib, and
 # really, it's not the future anymore: drop it.
 CONFIGURE_ARGS += --without-dps

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.