summaryrefslogtreecommitdiff
path: root/vhook
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-07-14 16:18:59 +0000
committerDiego Biurrun <diego@biurrun.de>2006-07-14 16:18:59 +0000
commit3409385da635da8a36f93991ad016c25f66df68a (patch)
tree49f7863c3c7111909fdb6d7ad286fab7a1428c09 /vhook
parent302cdccfc1e7a385449ab181619f7ae1a129e1b0 (diff)
Properly handle vhook build flags for platforms that require special handling.
Removes one of the last FIXMEs from the build system. Originally committed as revision 5745 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook')
-rw-r--r--vhook/Makefile8
1 files changed, 1 insertions, 7 deletions
diff --git a/vhook/Makefile b/vhook/Makefile
index 219827d3c3..dc311b83f3 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -5,12 +5,6 @@ VPATH=$(SRC_PATH)/vhook
CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
-#FIXME: This needs to be in configure/config.mak
-ifeq ($(CONFIG_DARWIN),yes)
- SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace \
- -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
-endif
-
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
@@ -41,7 +35,7 @@ uninstall:
-rmdir "$(libdir)/vhook/"
%$(SLIBSUF): %.o
- $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
+ $(CC) $(LDFLAGS) -g -o $@ $(VHOOKFLAGS) $<
clean:
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll