sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better support for multiple Python installs

Browse Source
This commit is contained in:
John Cupitt 2008-05-12 09:57:45 +00:00
parent 288161e420
commit 5d278b725f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,7 @@
- read and write CMYKA tiff (thanks Doron) - read and write CMYKA tiff (thanks Doron)
- performance improvements for morphology ops, esp. when zooming out - performance improvements for morphology ops, esp. when zooming out
- oop, im_render() was broken for mask == NULL - oop, im_render() was broken for mask == NULL
- better support for multiple Python installs (thanks Jay)
25/1/08 started 7.14.0 25/1/08 started 7.14.0
- bump all version numbers for new stable - bump all version numbers for new stable

8
python/vipsCC/Makefile.am
View File

@ -1,11 +1,13 @@
INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ @PYTHON_INCLUDES@ # Let make substitute the value of PYTHON_INCLUDES rather than auto*
# # this makes it easier to support multiple python installs
INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ $(PYTHON_INCLUDES)
# we install to a directory inside the python area, since we are a module # we install to a directory inside the python area, since we are a module
vipsccdir = $(pyexecdir)/vipsCC vipsccdir = $(pyexecdir)/vipsCC
vipscc_PYTHON = VImage.py VDisplay.py VError.py VMask.py __init__.py vipscc_PYTHON = VImage.py VDisplay.py VError.py VMask.py __init__.py
# I tried making a suffix rule for this (and defining SUFFIXES) but I couldn;t # I tried making a suffix rule for this (and defining SUFFIXES) but I couldn't
# get it to work, how annoying # get it to work, how annoying
# FIXME at some point # FIXME at some point
# #
@ -24,6 +26,8 @@ vmaskmodule.cxx: VMask.i
vipscc_LTLIBRARIES = vimagemodule.la vdisplaymodule.la verrormodule.la vmaskmodule.la vipscc_LTLIBRARIES = vimagemodule.la vdisplaymodule.la verrormodule.la vmaskmodule.la
# maybe there's a clever way to avoid repeating the link stuff 4 times
# vimagemodule uses the C API as well, so it needs libvips too
vimagemodule_la_LDFLAGS = -module -avoid-version vimagemodule_la_LDFLAGS = -module -avoid-version
vimagemodule_la_LIBADD = ../../libsrcCC/libvipsCC.la ../../libsrc/libvips.la $(VIPS_LIBS) vimagemodule_la_LIBADD = ../../libsrcCC/libvipsCC.la ../../libsrc/libvips.la $(VIPS_LIBS)
nodist_vimagemodule_la_SOURCES = vimagemodule.cxx nodist_vimagemodule_la_SOURCES = vimagemodule.cxx