aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-07-09 19:28:18 +0000
committerDiego Biurrun <diego@biurrun.de>2007-07-09 19:28:18 +0000
commit742c94cbb4c387767b8a41cb7eb592bad4514365 (patch)
tree07f52605a1f8f6d7a6316ef6f63e212735e4566d
parent7ed8ccb50e2c672e28e1e55f1a62965571d511b1 (diff)
downloadffmpeg-742c94cbb4c387767b8a41cb7eb592bad4514365.tar.gz
10l: The ppm video hook depends on fork().
This dependency was apparently accidentally lost while making the vhook build process non-recursive. Originally committed as revision 9562 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 58d0d75614..a020ec6345 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,12 @@ all: videohook
install: install-vhook
endif
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
-HOOKS = vhook/null$(SLIBSUF) vhook/fish$(SLIBSUF) vhook/ppm$(SLIBSUF) vhook/watermark$(SLIBSUF)
-ALLHOOKS = $(HOOKS) vhook/imlib2$(SLIBSUF) vhook/drawtext$(SLIBSUF)
+HOOKS = vhook/fish$(SLIBSUF) vhook/null$(SLIBSUF) vhook/watermark$(SLIBSUF)
+ALLHOOKS = $(HOOKS) vhook/drawtext$(SLIBSUF) vhook/imlib2$(SLIBSUF) vhook/ppm$(SLIBSUF)
ALLHOOKS_SRCS := $(ALLHOOKS:$(SLIBSUF)=.c)
+ifeq ($(HAVE_FORK),yes)
+HOOKS += vhook/ppm(SLIBSUF)
+endif
ifeq ($(HAVE_IMLIB2),yes)
HOOKS += vhook/imlib2$(SLIBSUF)
VHOOKCFLAGS += `imlib2-config --cflags`