# HG changeset patch # User mru # Date 1116425117 0 # Node ID 97c135899d7da695d1a011eb3674309d1ecf0937 # Parent 360024d31dabd4ba10858ac7da07d6af0e53ea21 fix shared libpostproc build diff -r 360024d31dab -r 97c135899d7d Makefile --- a/Makefile Wed May 18 09:17:22 2005 +0000 +++ b/Makefile Wed May 18 14:05:17 2005 +0000 @@ -267,7 +267,7 @@ 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 -r 360024d31dab -r 97c135899d7d libpostproc/Makefile --- a/libpostproc/Makefile Wed May 18 09:17:22 2005 +0000 +++ b/libpostproc/Makefile Wed May 18 14:05:17 2005 +0000 @@ -5,7 +5,8 @@ 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 @@ $(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 @@ 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 #