Mercurial > libavcodec.hg
changeset 2285:9891c6a212ca libavcodec
Build process: libpostproc patch by (Franti?ek Dvo?k <valtri at users dot sourceforge dot net>)
| author | michael |
|---|---|
| date | Tue, 05 Oct 2004 17:43:10 +0000 |
| parents | 6d26e105f68f |
| children | 0f937b191cc3 |
| files | Makefile libpostproc/Makefile |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Oct 03 22:01:21 2004 +0000 +++ b/Makefile Tue Oct 05 17:43:10 2004 +0000 @@ -102,7 +102,7 @@ ifeq ($(CONFIG_PP),yes) ifeq ($(SHARED_PP),yes) -EXTRALIBS += -lpostproc +EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc else # LIBS += libpostproc/libpostproc.a ... should be fixed OBJS += libpostproc/postprocess.o @@ -207,6 +207,9 @@ $(RANLIB) $@ $(SLIB): $(OBJS) +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C $(VPATH)/libpostproc +endif ifeq ($(CONFIG_WIN32),yes) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) @@ -287,6 +290,9 @@ ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so ldconfig || true endif +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C $(VPATH)/libpostproc $@ +endif else install: endif
--- a/libpostproc/Makefile Sun Oct 03 22:01:21 2004 +0000 +++ b/libpostproc/Makefile Tue Oct 05 17:43:10 2004 +0000 @@ -2,10 +2,10 @@ include ../../config.mak ifeq ($(SHARED_PP),yes) -SPPLIB = libpostproc.so +SPPLIB = $(SLIBPREF)postproc$(SLIBSUF) SPPVERSION = 0.0.1 endif -PPLIB = libpostproc.a +PPLIB = $(LIBPREF)postproc$(LIBSUF) PPOBJS=postprocess.o SPPOBJS=postprocess_pic.o @@ -23,7 +23,7 @@ all: $(SWSLIB) $(PPLIB) $(SPPLIB) clean: - rm -f *.o *.a *~ *.so + rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB) distclean: rm -f Makefile.bak *.o *.a *~ *.so .depend @@ -49,11 +49,15 @@ install: all ifeq ($(SHARED_PP),yes) +ifeq ($(CONFIG_WIN32),yes) + install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)" +else install -d $(prefix)/lib install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) ldconfig || true endif +endif mkdir -p $(prefix)/include/postproc install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h