summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile5
-rw-r--r--graphics/gdk-pixbuf-gnome/PLIST11
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink.mk4
-rw-r--r--graphics/gdk-pixbuf/Makefile5
-rw-r--r--graphics/gdk-pixbuf/Makefile.common12
-rw-r--r--graphics/gdk-pixbuf/PLIST15
-rw-r--r--graphics/gdk-pixbuf/buildlink.mk69
-rw-r--r--graphics/gdk-pixbuf/distinfo8
-rw-r--r--graphics/gdk-pixbuf/patches/patch-ad26
9 files changed, 97 insertions, 58 deletions
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 05e23b04586..7ab250edbb4 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2002/04/10 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/05/11 11:56:58 rh Exp $
PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
-PKGREVISION= 1
COMMENT= the GNOME image loading library GNOME canvas support add-on
CONFLICTS+= gdk-pixbuf<0.10.1
@@ -13,7 +12,7 @@ BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
do-install:
${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
- ${PREFIX}/include/gdk-pixbuf
+ ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf
${INSTALL_DATA} ${WRKSRC}/gnomecanvaspixbufConf.sh \
${PREFIX}/lib
cd ${WRKSRC}/gdk-pixbuf && \
diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST
index 63f1b2bbc45..3d39e623539 100644
--- a/graphics/gdk-pixbuf-gnome/PLIST
+++ b/graphics/gdk-pixbuf-gnome/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:51 zuntum Exp $
-include/gdk-pixbuf/gnome-canvas-pixbuf.h
+@comment $NetBSD: PLIST,v 1.2 2002/05/11 11:56:59 rh Exp $
+include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
lib/gnomecanvaspixbufConf.sh
lib/libgnomecanvaspixbuf.so.1.0
lib/libgnomecanvaspixbuf.so.1
@@ -9,8 +9,14 @@ lib/libgnomecanvaspixbuf.a
share/gnome/html/gdk-pixbuf/a2605.html
share/gnome/html/gdk-pixbuf/a3640.html
share/gnome/html/gdk-pixbuf/a3652.html
+share/gnome/html/gdk-pixbuf/a3657.html
share/gnome/html/gdk-pixbuf/a3694.html
+share/gnome/html/gdk-pixbuf/a3696.html
share/gnome/html/gdk-pixbuf/a3716.html
+share/gnome/html/gdk-pixbuf/x3676.html
+share/gnome/html/gdk-pixbuf/x3715.html
+share/gnome/html/gdk-pixbuf/x3728.html
+share/gnome/html/gdk-pixbuf/x3767.html
share/gnome/html/gdk-pixbuf/book1.html
share/gnome/html/gdk-pixbuf/compiling.html
share/gnome/html/gdk-pixbuf/extra-configuration-options.html
@@ -30,7 +36,6 @@ share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html
share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
share/gnome/html/gdk-pixbuf/index.html
-share/gnome/html/gdk-pixbuf/index.sgml
share/gnome/html/gdk-pixbuf/license.html
share/gnome/html/gdk-pixbuf/r15.html
share/gnome/html/gdk-pixbuf/r27.html
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index 00e77a0ec90..0c9755f1490 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:07 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/05/11 11:56:59 rh Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
#
@@ -22,7 +22,7 @@ DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf-gnome}:../../graphics/gdk-pixbuf-gnome
EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT= ${X11PREFIX}
-BUILDLINK_FILES.gdk-pixbuf-gnome= include/gdk-pixbuf/gnome-canvas-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf-gnome= include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
BUILDLINK_FILES.gdk-pixbuf-gnome+= lib/libgnomecanvaspixbuf.*
.include "../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index cb0e1c173e9..afb31f1d830 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:06 fredb Exp $
+# $NetBSD: Makefile,v 1.21 2002/05/11 11:56:58 rh Exp $
#
PKGNAME= ${DISTNAME}
-PKGREVISION= 1
COMMENT= the GNOME image loading library
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK_ONLY= YES
.include "Makefile.common"
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 5a8a673893c..3070f7f50a5 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.21 2002/03/15 00:46:02 fredb Exp $
+# $NetBSD: Makefile.common,v 1.22 2002/05/11 11:56:58 rh Exp $
#
-DISTNAME= gdk-pixbuf-0.11.0
+DISTNAME= gdk-pixbuf-0.17.0
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
@@ -10,12 +10,12 @@ HOMEPAGE= http://www.gnome.org/
BUILD_DEPENDS+= automake>=1.4:../../devel/automake
-USE_GMAKE= # defined
-USE_X11BASE= # defined
-USE_LIBTOOL= # defined
+USE_GMAKE= YES
+USE_X11BASE= YES
+USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-GNU_CONFIGURE= # defined
+GNU_CONFIGURE= YES
CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
M4= ${LOCALBASE}/bin/gm4
diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST
index 5f2f4da3c8e..1f1e90680c2 100644
--- a/graphics/gdk-pixbuf/PLIST
+++ b/graphics/gdk-pixbuf/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/11 11:56:58 rh Exp $
bin/gdk-pixbuf-config
-include/gdk-pixbuf/gdk-pixbuf.h
-include/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gdk-pixbuf/gdk-pixbuf-features.h
-include/gdk-pixbuf/gdk-pixbuf-xlib.h
-include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
+include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h
lib/libgdk_pixbuf.so.2.0
lib/libgdk_pixbuf.so.2
lib/libgdk_pixbuf.so
@@ -50,6 +50,7 @@ lib/gdk_pixbuf_xlibConf.sh
share/aclocal/gdk-pixbuf.m4
@dirrm lib/gdk-pixbuf/loaders
@dirrm lib/gdk-pixbuf
-@dirrm include/gdk-pixbuf
+@dirrm include/gdk-pixbuf-1.0/gdk-pixbuf
+@dirrm include/gdk-pixbuf-1.0
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gdk-pixbuf.m4 ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 9b254b27746..133025693f6 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,10 +1,12 @@
-# $NetBSD: buildlink.mk,v 1.12 2002/03/13 17:37:07 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.13 2002/05/11 11:56:58 rh Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf.
#
+# This file was created automatically using createbuildlink 1.5.
+#
# To use this Makefile fragment, simply:
#
-# (1) Optionally define BUILDLINK_DEPENDS.gkd-pixbuf to the dependency version
+# (1) Optionally define BUILDLINK_DEPENDS.gdk-pixbuf to the dependency pattern
# for the version of gdk-pixbuf desired.
# (2) Include this Makefile fragment in the package Makefile,
# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
@@ -17,12 +19,28 @@ GDK_PIXBUF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.11.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.17.0
DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf}:../../graphics/gdk-pixbuf
-EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
+EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
BUILDLINK_PREFIX.gdk-pixbuf_DEFAULT= ${X11PREFIX}
-BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf/*
+BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
+BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
+BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
+BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
+BUILDLINK_FILES.gdk-pixbuf+= include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-bmp.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-gif.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ico.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-png.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-pnm.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-ras.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-tiff.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xbm.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk-pixbuf/loaders/libpixbufloader-xpm.*
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbufConf.sh
+BUILDLINK_FILES.gdk-pixbuf+= lib/gdk_pixbuf_xlibConf.sh
BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf.*
BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.*
@@ -32,24 +50,41 @@ BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.*
.include "../../x11/gtk/buildlink.mk"
BUILDLINK_TARGETS.gdk-pixbuf= gdk-pixbuf-buildlink
-BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-buildlink-config-wrapper
+BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-gdk-pixbuf-buildlink-config-wrapper
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gdk-pixbuf}
-BUILDLINK_CONFIG.gdk-pixbuf= \
- ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config
-BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= \
- ${BUILDLINK_DIR}/bin/gdk-pixbuf-config
-REPLACE_BUILDLINK_SED+= \
- -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf}|g"
+BUILDLINK_CONFIG.gdk-pixbuf-gdk-pixbuf= \
+ ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config
+BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf= \
+ ${BUILDLINK_DIR}/bin/gdk-pixbuf-config
+REPLACE_BUILDLINK_SED+= \
+ -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf-gdk-pixbuf}|g"
+
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-I[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0/gdk-pixbuf|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0/gdk-pixbuf|g"
+REPLACE_BUILDLINK_SED+= \
+ -e "s|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0/gdk-pixbuf|-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0/gdk-pixbuf|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-I[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0|g"
+REPLACE_BUILDLINK_SED+= \
+ -e "s|-I${BUILDLINK_DIR}/include/gdk-pixbuf-1.0|-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-L[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf/loaders|-L${BUILDLINK_DIR}/lib/gdk-pixbuf/loaders|g"
+REPLACE_BUILDLINK_SED+= \
+ -e "s|-L${BUILDLINK_DIR}/lib/gdk-pixbuf/loaders|-L${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf/loaders|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-L[ ]*${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf|-L${BUILDLINK_DIR}/lib/gdk-pixbuf|g"
+REPLACE_BUILDLINK_SED+= \
+ -e "s|-L${BUILDLINK_DIR}/lib/gdk-pixbuf|-L${BUILDLINK_PREFIX.gdk-pixbuf}/lib/gdk-pixbuf|g"
.if defined(USE_CONFIG_WRAPPER)
-GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}
-CONFIGURE_ENV+= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
-MAKE_ENV+= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
+GDK_PIXBUF_GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gdk-pixbuf}
+CONFIGURE_ENV+= GDK_PIXBUF_GDK_PIXBUF_CONFIG="${GDK_PIXBUF_GDK_PIXBUF_CONFIG}"
+MAKE_ENV+= GDK_PIXBUF_GDK_PIXBUF_CONFIG="${GDK_PIXBUF_GDK_PIXBUF_CONFIG}"
.endif
-pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf}
+pre-configure: ${BUILDLINK_TARGETS}
gdk-pixbuf-buildlink: _BUILDLINK_USE
-gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+gdk-pixbuf-gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
.endif # GDK_PIXBUF_BUILDLINK_MK
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 3736be289d6..70acd5c486f 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/02/27 06:41:05 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/05/11 11:56:58 rh Exp $
-SHA1 (gdk-pixbuf-0.11.0.tar.gz) = cddc0cccc246c910312b53e9e7f8dc1f63a2ef1f
-Size (gdk-pixbuf-0.11.0.tar.gz) = 459728 bytes
+SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313
+Size (gdk-pixbuf-0.17.0.tar.gz) = 547194 bytes
SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8
-SHA1 (patch-ad) = 8841c915841c2ec71082a8894b12038b97bb2088
+SHA1 (patch-ad) = 4a16e30eda46b55f51f87785e5f76ea33d3bd8ed
SHA1 (patch-ae) = 8c68907ba7566b1432d5593caeb6ab4f0551f27d
diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad
index dc2ef46a105..4272b3d2c4c 100644
--- a/graphics/gdk-pixbuf/patches/patch-ad
+++ b/graphics/gdk-pixbuf/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
+$NetBSD: patch-ad,v 1.3 2002/05/11 11:56:58 rh Exp $
---- gdk-pixbuf/Makefile.am.orig Thu Mar 1 00:05:34 2001
-+++ gdk-pixbuf/Makefile.am Sun Mar 18 04:57:50 2001
+--- gdk-pixbuf/Makefile.am.orig Fri Jan 4 12:54:48 2002
++++ gdk-pixbuf/Makefile.am
@@ -24,70 +24,70 @@
# The PNG plugin.
#
libpixbufloader_png_la_SOURCES = io-png.c
-libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_png_la_LDFLAGS = -module -avoid-version
- libpixbufloader_png_la_LIBADD = $(LIBPNG)
+ libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
#
# The JPEG loader
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
-libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
- libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
+ libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
#
# The XPM loader
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_xpm_la_SOURCES = io-xpm.c
-libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
- libpixbufloader_xpm_la_LIBADD =
+ libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The GIF loader
@@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_gif_la_SOURCES = io-gif.c
-libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
- libpixbufloader_gif_la_LIBADD =
+ libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The ICO loader
@@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_ico_la_SOURCES = io-ico.c
-libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
- libpixbufloader_ico_la_LIBADD =
+ libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The RAS loader
@@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_ras_la_SOURCES = io-ras.c
-libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
- libpixbufloader_ras_la_LIBADD =
+ libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The TIFF loader
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_tiff_la_SOURCES = io-tiff.c
-libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
- libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
+ libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
#
# The PNM loader
@@ -64,7 +64,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_pnm_la_SOURCES = io-pnm.c
-libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
- libpixbufloader_pnm_la_LIBADD =
+ libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The BMP loader
@@ -72,7 +72,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_bmp_la_SOURCES = io-bmp.c
-libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
- libpixbufloader_bmp_la_LIBADD =
+ libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
#
# The XBM loader
@@ -80,6 +80,6 @@ $NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
libpixbufloader_xbm_la_SOURCES = io-xbm.c
-libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
+libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
- libpixbufloader_xbm_la_LIBADD =
+ libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
if HAVE_PNG