SHARED_LIBS and USE_LIBTOOL
"go ahead" bernd@
This commit is contained in:
parent
b98f771dda
commit
5451cee62d
@ -1,11 +1,18 @@
|
|||||||
# $OpenBSD: Makefile,v 1.83 2005/06/28 18:08:23 naddy Exp $
|
# $OpenBSD: Makefile,v 1.84 2005/12/28 14:56:54 steven Exp $
|
||||||
|
|
||||||
COMMENT= "image processing tools"
|
COMMENT= "image processing tools"
|
||||||
|
|
||||||
VER= 6.2.3
|
VER= 6.2.3
|
||||||
DASHVER= 3
|
DASHVER= 3
|
||||||
DISTNAME= ImageMagick-${VER}-${DASHVER}
|
DISTNAME= ImageMagick-${VER}-${DASHVER}
|
||||||
PKGNAME= ImageMagick-${VER}.${DASHVER}
|
PKGNAME= ImageMagick-${VER}.${DASHVER}p0
|
||||||
|
SHARED_LIBS= Magick++ 8.3 \
|
||||||
|
Magick 8.3 \
|
||||||
|
Wand 8.3
|
||||||
|
MODGNU_SHARED_LIBS= Magick++ '' \
|
||||||
|
Magick '-no-undefined' \
|
||||||
|
Wand '-no-undefined'
|
||||||
|
|
||||||
CATEGORIES= graphics
|
CATEGORIES= graphics
|
||||||
|
|
||||||
HOMEPAGE= http://www.imagemagick.org
|
HOMEPAGE= http://www.imagemagick.org
|
||||||
@ -36,6 +43,7 @@ PERMIT_DISTFILES_CDROM= Yes
|
|||||||
PERMIT_DISTFILES_FTP= Yes
|
PERMIT_DISTFILES_FTP= Yes
|
||||||
WANTLIB= c iconv jpeg m z
|
WANTLIB= c iconv jpeg m z
|
||||||
|
|
||||||
|
USE_LIBTOOL= Yes
|
||||||
SEPARATE_BUILD= concurrent
|
SEPARATE_BUILD= concurrent
|
||||||
CONFIGURE_STYLE= autoconf
|
CONFIGURE_STYLE= autoconf
|
||||||
AUTOCONF_VERSION= 2.59
|
AUTOCONF_VERSION= 2.59
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-Makefile_in,v 1.2 2005/06/04 14:39:21 naddy Exp $
|
$OpenBSD: patch-Makefile_in,v 1.3 2005/12/28 14:56:54 steven Exp $
|
||||||
--- Makefile.in.orig Tue May 24 00:33:09 2005
|
--- Makefile.in.orig Fri Jun 24 06:07:35 2005
|
||||||
+++ Makefile.in Sun May 29 20:00:32 2005
|
+++ Makefile.in Wed Dec 28 11:39:40 2005
|
||||||
@@ -1910,7 +1910,7 @@ EXTRA_DIST = \
|
@@ -1914,7 +1914,7 @@ EXTRA_DIST = \
|
||||||
$(UTILITIES_EXTRA_DIST) \
|
$(UTILITIES_EXTRA_DIST) \
|
||||||
$(WAND_EXTRA_DIST)
|
$(WAND_EXTRA_DIST)
|
||||||
|
|
||||||
@ -10,3 +10,32 @@ $OpenBSD: patch-Makefile_in,v 1.2 2005/06/04 14:39:21 naddy Exp $
|
|||||||
|
|
||||||
# Where architecture-independent configuration files get installed
|
# Where architecture-independent configuration files get installed
|
||||||
# (share/ImageMagick-version)
|
# (share/ImageMagick-version)
|
||||||
|
@@ -2802,8 +2802,7 @@ LIBMAGICK = magick/libMagick.la
|
||||||
|
@WITH_MODULES_FALSE@magick_libMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(LIBLTDL)
|
||||||
|
@WITH_MODULES_TRUE@magick_libMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(LIBLTDL)
|
||||||
|
magick_libMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
|
||||||
|
-magick_libMagick_la_LDFLAGS = -no-undefined \
|
||||||
|
- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
|
||||||
|
+magick_libMagick_la_LDFLAGS = $(libMagick_la_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
# Library base sources
|
||||||
|
@@ -3161,8 +3160,7 @@ WAND_BUILT_SRCS = \
|
||||||
|
|
||||||
|
LIBWAND = wand/libWand.la
|
||||||
|
wand_libWand_la_SOURCES = $(WAND_SOURCES)
|
||||||
|
-wand_libWand_la_LDFLAGS = -no-undefined \
|
||||||
|
- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
|
||||||
|
+wand_libWand_la_LDFLAGS = $(libWand_la_LDFLAGS)
|
||||||
|
|
||||||
|
wand_libWand_la_LIBADD = $(LIBMAGICK) $(LIB_MATH)
|
||||||
|
WAND_EXTRA_DIST = \
|
||||||
|
@@ -3317,7 +3315,7 @@ WAND_CLEANFILES = \
|
||||||
|
@WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/lib/Magick++/TypeMetric.h
|
||||||
|
|
||||||
|
@WITH_MAGICK_PLUS_PLUS_TRUE@Magick___lib_libMagick___la_LDFLAGS = \
|
||||||
|
-@WITH_MAGICK_PLUS_PLUS_TRUE@ -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
|
||||||
|
+@WITH_MAGICK_PLUS_PLUS_TRUE@ $(libMagick++_la_LDFLAGS)
|
||||||
|
|
||||||
|
@WITH_MAGICK_PLUS_PLUS_TRUE@Magick___lib_libMagick___la_LIBADD = $(LIBMAGICK) $(LIBWAND)
|
||||||
|
@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.12 2005/06/04 14:39:21 naddy Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.13 2005/12/28 14:56:54 steven Exp $
|
||||||
@lib lib/libMagick++.so.8.3
|
@lib lib/libMagick++.so.${LIBMagick++_VERSION}
|
||||||
@lib lib/libMagick.so.8.3
|
@lib lib/libMagick.so.${LIBMagick_VERSION}
|
||||||
@lib lib/libWand.so.8.3
|
@lib lib/libWand.so.${LIBWand_VERSION}
|
||||||
|
Loading…
Reference in New Issue
Block a user