Browse Source

Declare libpostproc prerequisites directly instead of using a layer of

indirection. This moves build system workarounds closer to libpostproc
where they are really needed.

Originally committed as revision 10874 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
582c1c47da
2 changed files with 5 additions and 7 deletions
  1. +2
    -4
      common.mak
  2. +3
    -3
      libpostproc/Makefile

+ 2
- 4
common.mak View File

@@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \

SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS)

all: $(LIBNAME) $(SLIBNAME)

$(LIBNAME): $(STATIC_OBJS)
$(LIBNAME): $(OBJS)
rm -f $@
$(AR) rc $@ $^ $(EXTRAOBJS)
$(RANLIB) $@
@@ -29,7 +27,7 @@ $(LIBNAME): $(STATIC_OBJS)
$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
$(LN_S) $^ $@

$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
$(SLIBNAME_WITH_MAJOR): $(OBJS)
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
$(SLIB_EXTRA_CMD)



+ 3
- 3
libpostproc/Makefile View File

@@ -10,13 +10,13 @@ NAME=postproc
LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR)

STATIC_OBJS=postprocess.o
SHARED_OBJS=postprocess_pic.o

HEADERS = postprocess.h

include ../common.mak

$(LIBNAME): postprocess.o
$(SLIBNAME_WITH_MAJOR): postprocess_pic.o

depend dep: postprocess.c

postprocess_pic.o: postprocess.c


Loading…
Cancel
Save