Commit d0e21a75 authored by mru's avatar mru

fix shared libpostproc build


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4272 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7301ffcb
...@@ -267,7 +267,7 @@ endif ...@@ -267,7 +267,7 @@ endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF) EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
else else
# LIBS += libpostproc/libpostproc.a ... should be fixed # LIBS += libpostproc/libpostproc.a ... should be fixed
OBJS += libpostproc/postprocess.o OBJS += libpostproc/postprocess.o
......
...@@ -5,7 +5,8 @@ VPATH=$(SRC_PATH)/libavcodec/libpostproc ...@@ -5,7 +5,8 @@ VPATH=$(SRC_PATH)/libavcodec/libpostproc
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
SPPLIB = $(SLIBPREF)postproc$(SLIBSUF) SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
SPPVERSION = 0.0.1 SPPMAJOR = 0
SPPVERSION = $(SPPMAJOR).0.1
endif endif
PPLIB = $(LIBPREF)postproc$(LIBSUF) PPLIB = $(LIBPREF)postproc$(LIBSUF)
...@@ -40,7 +41,7 @@ postprocess_pic.o: postprocess.c ...@@ -40,7 +41,7 @@ postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $< $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
$(SPPLIB): $(SPPOBJS) $(SPPLIB): $(SPPOBJS)
$(CC) -shared -Wl,-soname,$(SPPLIB).0 \ $(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
-o $(SPPLIB) $(SPPOBJS) -o $(SPPLIB) $(SPPOBJS)
endif endif
...@@ -57,11 +58,12 @@ else ...@@ -57,11 +58,12 @@ else
install -d $(libdir) install -d $(libdir)
install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION) install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB) ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
ldconfig || true ldconfig || true
endif endif
endif endif
mkdir -p $(prefix)/include/postproc 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
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment