diff options
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | vhook/Makefile | 4 |
2 files changed, 7 insertions, 9 deletions
@@ -439,7 +439,7 @@ dlfcn="no" dlopen="no" mpegaudio_hp="yes" SHFLAGS='-shared -Wl,-soname,$@' -VHOOKFLAGS="$SHFLAGS" +VHOOKSHFLAGS="$SHFLAGS" netserver="no" need_inet_aton="no" protocols="yes" @@ -572,7 +572,7 @@ v4l2="no" audio_oss="no" dv1394="no" SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)" -VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@' +VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@' extralibs="" strip="strip -x" installstrip="" @@ -1579,18 +1579,16 @@ else echo "INSTALLSTRIP=" >> config.mak fi -# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building -# shared modules on OS/X (vhook/Makefile). -SHCFLAGS="$CFLAGS" +VHOOKCFLAGS="-fPIC $CFLAGS" test "$needmdynamicnopic" = yes && add_cflags -mdynamic-no-pic echo "OPTFLAGS=$CFLAGS" >> config.mak -echo "SHCFLAGS=$SHCFLAGS">>config.mak +echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDCONFIG=$LDCONFIG" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak -echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak +echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "BUILD_STATIC=$lstatic" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak diff --git a/vhook/Makefile b/vhook/Makefile index 7e9204c545..13353551b4 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -2,7 +2,7 @@ include ../config.mak VPATH=$(SRC_PATH)/vhook -CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \ +CFLAGS=$(VHOOKCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) @@ -35,7 +35,7 @@ uninstall: -rmdir "$(shlibdir)/vhook/" %$(SLIBSUF): %.o - $(CC) $(LDFLAGS) -g -o $@ $(VHOOKFLAGS) $< + $(CC) $(LDFLAGS) -g -o $@ $(VHOOKSHFLAGS) $< clean: rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll |