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

hson at users.sourceforge.net hson at users.sourceforge.net
Mon Jan 11 16:53:57 CET 2010


Revision: 7970
          http://gar.svn.sourceforge.net/gar/?rev=7970&view=rev
Author:   hson
Date:     2010-01-11 15:53:57 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
imagemagick: Fixes for linking X11 libs

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

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-01-11 15:28:58 UTC (rev 7969)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2010-01-11 15:53:57 UTC (rev 7970)
@@ -20,23 +20,24 @@
 
 LICENSE = LICENSE
 
-REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWggettextrt
+REQUIRED_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt
 REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit
 REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2
 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib
-REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext
+REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz
+REQUIRED_PKGS += CSWlibx11 CSWlibxt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
 
-CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11
+#CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
 CONFIGURE_ARGS += --enable-shared --disable-static
 CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes
-CONFIGURE_ARGS += --x-includes=/usr/openwin/include
-CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib 
+CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include
+CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib 
 CONFIGURE_ARGS += --disable-openmp
 
 PATCHFILES += Makefile.patch
@@ -44,9 +45,17 @@
 #PATCHFILES += djvu.c.diff
 
 # Test has to be run *after* install
-TEST_SCRIPTS =
+#TEST_TARGET = check
+TEST_TARGET = 
 
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 EXTRA_LD_OPTIONS = -L./magick/.libs 
+# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib
+# since the latter is linked to /usr/openwin/lib/libX11.so.4
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
 MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la
 EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
 


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



More information about the devel mailing list