From 7919d97e6db122f6dbbaeddd0ce8a57812e3769a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 18 May 2005 14:05:17 +0000 Subject: [PATCH] fix shared libpostproc build Originally committed as revision 4272 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 2 +- libavcodec/libpostproc/Makefile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2dde323157..ee36c0381f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -267,7 +267,7 @@ endif ifeq ($(CONFIG_PP),yes) ifeq ($(SHARED_PP),yes) -EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF) +EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF) else # LIBS += libpostproc/libpostproc.a ... should be fixed OBJS += libpostproc/postprocess.o diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index bf074d7e15..958be44a76 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -5,7 +5,8 @@ VPATH=$(SRC_PATH)/libavcodec/libpostproc ifeq ($(SHARED_PP),yes) SPPLIB = $(SLIBPREF)postproc$(SLIBSUF) -SPPVERSION = 0.0.1 +SPPMAJOR = 0 +SPPVERSION = $(SPPMAJOR).0.1 endif PPLIB = $(LIBPREF)postproc$(LIBSUF) @@ -40,7 +41,7 @@ postprocess_pic.o: postprocess.c $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $< $(SPPLIB): $(SPPOBJS) - $(CC) -shared -Wl,-soname,$(SPPLIB).0 \ + $(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \ -o $(SPPLIB) $(SPPOBJS) endif @@ -57,11 +58,12 @@ else install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION) ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB) + ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR) ldconfig || true endif endif mkdir -p $(prefix)/include/postproc - install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h + install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h #