diff options
| author | tv <tv@pkgsrc.org> | 1998-07-26 14:36:43 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 1998-07-26 14:36:43 +0000 |
| commit | 3b3ed2376b06668f3e3622f4c6d6a1b4670ce785 (patch) | |
| tree | 0a8f1b48c7477cd95337ac11e9a3017114829030 | |
| parent | 460b9f3c111f6f1bf876db36f83acdfb5fbd61ec (diff) | |
| download | pkgsrc-3b3ed2376b06668f3e3622f4c6d6a1b4670ce785.tar.gz | |
- Get the dependencies right: the library is libmpeg.la, so actually tell
make that we're building libmpeg.la.
- Don't try to call libtool with an argument of libtool; just let libtool
detect the compile or link mode automagically.
| -rw-r--r-- | graphics/mpeg-lib/Makefile | 3 | ||||
| -rw-r--r-- | graphics/mpeg-lib/patches/patch-ap | 22 |
2 files changed, 15 insertions, 10 deletions
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index 58c1ab178fe..f353c6cbc4c 100644 --- a/graphics/mpeg-lib/Makefile +++ b/graphics/mpeg-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/07/24 01:57:00 tv Exp $ +# $NetBSD: Makefile,v 1.10 1998/07/26 14:36:43 tv Exp $ DISTNAME= mpeg_lib-1.2.1 PKGNAME= mpeg-1.2.1 @@ -11,6 +11,7 @@ MAINTAINER= tron@netbsd.org USE_LIBTOOL= yes GNU_CONFIGURE= yes +ALL_TARGET= libmpeg.la WRKSRC= ${WRKDIR}/mpeg_lib diff --git a/graphics/mpeg-lib/patches/patch-ap b/graphics/mpeg-lib/patches/patch-ap index 5d457574449..8d74e1d3efa 100644 --- a/graphics/mpeg-lib/patches/patch-ap +++ b/graphics/mpeg-lib/patches/patch-ap @@ -1,26 +1,30 @@ ---- Makefile.in.orig Tue Jul 14 15:08:58 1998 -+++ Makefile.in Tue Jul 14 15:12:56 1998 +--- Makefile.in.orig Mon Feb 26 13:12:54 1996 ++++ Makefile.in Sun Jul 26 10:25:54 1998 @@ -6,7 +6,7 @@ # Various programs and their options -CC = @CC@ -+CC = ${LIBTOOL} --mode=compile @CC@ ++CC = ${LIBTOOL} @CC@ OPT = @OPT@ DEFS = @DEFS@ INCLUDES = -I. -@@ -36,11 +36,12 @@ +@@ -31,7 +31,7 @@ - # Targets for all platforms + # Other files of interest + +-LIBRARY = libmpeg.a ++LIBRARY = libmpeg.la + MPEGTEST = mpegtest --all: $(LIBRARY) @extras@ -+all: $(LIBRARY) + # Targets for all platforms +@@ -39,8 +39,8 @@ + all: $(LIBRARY) @extras@ $(LIBRARY): $(LIBOBJ) - $(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ) - $(RANLIB) $(LIBRARY) -+ ${LIBTOOL} --mode=link ${CC} -o ${LIBRARY:.a=.la} \ -+ ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \ ++ ${CC} -o ${LIBRARY} ${LIBOBJ:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info 1:2 $(LIBOBJ): Makefile |