virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Declare libpostproc prerequisites directly instead of using a layer of

Browse Source 
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
This commit is contained in:
Diego Biurrun 2007-10-30 07:54:18 +00:00
parent 992e78f5f2
commit 582c1c47da
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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)

6
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