diff options
| author | jmmv <jmmv> | 2004-02-27 13:54:49 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-02-27 13:54:49 +0000 |
| commit | 21941193967611eeda2da0783db9eb4855748d30 (patch) | |
| tree | 61316cc3899f9b601af840b88026df34f9448f68 | |
| parent | 9280cdcf2082996a14aa417095bd1f132fa432b8 (diff) | |
| download | pkgsrc-21941193967611eeda2da0783db9eb4855748d30.tar.gz | |
Move inclusion of libiconv's bl3 file to the common Makefile, to fix the
build of xine-esound as shown by kristerw@'s last bulk build.
| -rw-r--r-- | audio/xine-arts/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/audio/xine-arts/Makefile b/audio/xine-arts/Makefile index 86f2c0b4242..7329d4bbfe3 100644 --- a/audio/xine-arts/Makefile +++ b/audio/xine-arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/25 18:02:08 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/27 13:54:49 jmmv Exp $ # .include "../../multimedia/xine-lib/Makefile.common" @@ -16,5 +16,4 @@ do-install: xineplug_ao_out_arts.la ${PREFIX}/lib/xine/plugins/1.0.0 .include "../../audio/arts/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 15673b8b91a..c9fd5722902 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/02/25 18:02:08 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/27 13:54:49 jmmv Exp $ # .include "Makefile.common" @@ -13,7 +13,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST .include "../../audio/flac/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/aalib/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index ce2de897177..bf6ac2f041d 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/02/25 18:02:08 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/02/27 13:54:49 jmmv Exp $ # DISTNAME= xine-lib-1-rc0a @@ -34,6 +34,7 @@ PLIST_SUBST+= XV_WORKAROUND="@comment " PLIST_SUBST+= XV_WORKAROUND="" .endif +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" |