diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-14 18:07:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-14 18:07:36 +0000 |
| commit | ba64106a398cb93898e26a6535b89c592b58ba46 (patch) | |
| tree | 8dca322e6693a44dd6012c042a2ada128d2d2d06 /libavcodec | |
| parent | dd1a74d25decd6eaa7c78a7062fa12edb043efaf (diff) | |
| download | ffmpeg-ba64106a398cb93898e26a6535b89c592b58ba46.tar.gz | |
Remove redundant --enable-shared-pp configure option and make the PP code
use the standard --enable-shared option.
Originally committed as revision 4858 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fc91026afd..2d1302a5fe 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -290,7 +290,7 @@ OBJS+= x264.o endif ifeq ($(CONFIG_PP),yes) -ifeq ($(SHARED_PP),yes) +ifeq ($(BUILD_SHARED),yes) EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF) else # LIBS += libpostproc/libpostproc.a ... should be fixed diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 7ea52b2868..7c7f8b487f 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -4,7 +4,7 @@ include ../../config.mak VPATH=$(SRC_PATH)/libavcodec/libpostproc NAME=postproc -ifeq ($(SHARED_PP),yes) +ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(SPPVERSION) LIBMAJOR=$(SPPMAJOR) endif @@ -35,7 +35,7 @@ dep: depend depend: $(CC) -MM $(CFLAGS) postprocess.c 1>.depend -ifeq ($(SHARED_PP),yes) +ifeq ($(BUILD_SHARED),yes) postprocess_pic.o: postprocess.c $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $< @@ -49,7 +49,7 @@ $(LIB): $(OBJS) $(RANLIB) $@ install: all -ifeq ($(SHARED_PP),yes) +ifeq ($(BUILD_SHARED),yes) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else |