clean up vhook variables
Originally committed as revision 9564 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
31
Makefile
31
Makefile
@@ -34,23 +34,26 @@ ifeq ($(CONFIG_VHOOK),yes)
|
|||||||
all: videohook
|
all: videohook
|
||||||
install: install-vhook
|
install: install-vhook
|
||||||
endif
|
endif
|
||||||
|
|
||||||
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
|
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
|
||||||
HOOKS = vhook/fish$(SLIBSUF) vhook/null$(SLIBSUF) vhook/watermark$(SLIBSUF)
|
|
||||||
ALLHOOKS = $(HOOKS) vhook/drawtext$(SLIBSUF) vhook/imlib2$(SLIBSUF) vhook/ppm$(SLIBSUF)
|
BASEHOOKS = fish null watermark
|
||||||
ALLHOOKS_SRCS := $(ALLHOOKS:$(SLIBSUF)=.c)
|
ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm
|
||||||
ifeq ($(HAVE_FORK),yes)
|
ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS)))
|
||||||
HOOKS += vhook/ppm(SLIBSUF)
|
|
||||||
endif
|
HOOKS-$(HAVE_FORK) += ppm
|
||||||
ifeq ($(HAVE_IMLIB2),yes)
|
HOOKS-$(HAVE_IMLIB2) += imlib2
|
||||||
HOOKS += vhook/imlib2$(SLIBSUF)
|
HOOKS-$(HAVE_FREETYPE2) += drawtext
|
||||||
VHOOKCFLAGS += `imlib2-config --cflags`
|
|
||||||
|
HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
|
||||||
|
|
||||||
|
VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
|
||||||
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
|
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
|
||||||
endif
|
|
||||||
ifeq ($(HAVE_FREETYPE2),yes)
|
VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
|
||||||
HOOKS += vhook/drawtext$(SLIBSUF)
|
|
||||||
VHOOKCFLAGS += `freetype-config --cflags`
|
|
||||||
LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
|
LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
|
||||||
endif
|
|
||||||
|
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
|
||||||
|
|
||||||
ifeq ($(BUILD_DOC),yes)
|
ifeq ($(BUILD_DOC),yes)
|
||||||
all: documentation
|
all: documentation
|
||||||
|
|||||||
Reference in New Issue
Block a user