diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-28 02:45:09 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-28 02:45:09 +0000 |
| commit | 88ad036874bd31f8060459a7962ac758bb320f1d (patch) | |
| tree | 8b768076089adf2f73ca1535051b82db1912d1a9 /Makefile | |
| parent | 79d6b9cbd04dd9b562d34ab1aeb6f946822f8ce3 (diff) | |
| download | ffmpeg-88ad036874bd31f8060459a7962ac758bb320f1d.tar.gz | |
Handle EXTRALIBS and LDFLAGS for libswscale and libavfilter in a simpler way.
Originally committed as revision 12615 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -72,18 +72,13 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` VHOOKCFLAGS += $(VHOOKCFLAGS-yes) -LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS) -EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) +LDFLAGS-$(CONFIG_SWSCALE) += -L$(BUILD_ROOT)/libswscale +LDFLAGS-$(CONFIG_AVFILTER) += -L$(BUILD_ROOT)/libavfilter +LDFLAGS := $(LDFLAGS-yes) -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS) -ifeq ($(CONFIG_SWSCALE),yes) -LDFLAGS+=-L$(BUILD_ROOT)/libswscale -EXTRALIBS+=-lswscale$(BUILDSUF) -endif - -ifeq ($(CONFIG_AVFILTER),yes) -LDFLAGS+=-L$(BUILD_ROOT)/libavfilter -EXTRALIBS := -lavfilter$(BUILDSUF) $(EXTRALIBS) -endif +EXTRALIBS-$(CONFIG_AVFILTER) += -lavfilter$(BUILDSUF) +EXTRALIBS-$(CONFIG_SWSCALE) += -lswscale$(BUILDSUF) +EXTRALIBS := $(EXTRALIBS-yes) -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) MAKE-yes = $(MAKE) MAKE- = : $(MAKE) |