diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-10 17:54:24 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-10 17:54:24 +0000 |
| commit | 13ca50f367d34a11a62ce4ae9317b0f7b2f6f81c (patch) | |
| tree | 7bcaa6c3149301628724b19e0c89437667955014 /Makefile | |
| parent | 781138d0052d7e528ff553ef16af26c49751e4af (diff) | |
| download | ffmpeg-13ca50f367d34a11a62ce4ae9317b0f7b2f6f81c.tar.gz | |
Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.
Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -66,7 +66,7 @@ SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS) EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) -ifeq ($(CONFIG_SWSCALER),yes) +ifeq ($(CONFIG_SWSCALE),yes) LDFLAGS+=-L$(BUILD_ROOT)/libswscale EXTRALIBS+=-lswscale$(BUILDSUF) endif @@ -87,7 +87,7 @@ lib: $(MAKE) -C libavformat all $(MAKE) -C libavdevice all $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale all + $(MAKE-$(CONFIG_SWSCALE)) -C libswscale all $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs @@ -173,7 +173,7 @@ install-libs: $(MAKE) -C libavformat install-libs $(MAKE) -C libavdevice install-libs $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-libs - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs + $(MAKE-$(CONFIG_SWSCALE)) -C libswscale install-libs $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs install-headers: @@ -222,7 +222,7 @@ depend dep: .depend .vhookdep $(MAKE) -C libavformat depend $(MAKE) -C libavdevice depend $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale depend + $(MAKE-$(CONFIG_SWSCALE)) -C libswscale depend $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend .depend: $(SRCS) version.h @@ -409,11 +409,11 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw @echo $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf -ifeq ($(CONFIG_SWSCALER),yes) +ifeq ($(CONFIG_SWSCALE),yes) test-server codectest $(CODEC_TESTS) libavtest: swscale_error swscale_error: @echo - @echo "This regression test is incompatible with --enable-swscaler." + @echo "This regression test is incompatible with --enable-swscale." @echo @exit 1 endif |