Mercurial > libavcodec.hg
changeset 2708:97c135899d7d libavcodec
fix shared libpostproc build
| author | mru |
|---|---|
| date | Wed, 18 May 2005 14:05:17 +0000 |
| parents | 360024d31dab |
| children | a119d4eb53d7 |
| files | Makefile libpostproc/Makefile |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 #