virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Make vhook CFLAGS handling less confusing.

Browse Source 
Originally committed as revision 6012 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-08-17 15:55:19 +00:00
parent 0e16a1fc92
commit 408382a434
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -439,7 +439,7 @@ dlfcn="no"
dlopen="no" dlopen="no"
mpegaudio_hp="yes" mpegaudio_hp="yes"
SHFLAGS='-shared -Wl,-soname,$@' SHFLAGS='-shared -Wl,-soname,$@'
VHOOKFLAGS="$SHFLAGS" VHOOKSHFLAGS="$SHFLAGS"
netserver="no" netserver="no"
need_inet_aton="no" need_inet_aton="no"
protocols="yes" protocols="yes"
@ -572,7 +572,7 @@ v4l2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)" 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="" extralibs=""
strip="strip -x" strip="strip -x"
installstrip="" installstrip=""
@ -1579,18 +1579,16 @@ else
echo "INSTALLSTRIP=" >> config.mak echo "INSTALLSTRIP=" >> config.mak
fi fi
# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building VHOOKCFLAGS="-fPIC $CFLAGS"
# shared modules on OS/X (vhook/Makefile).
SHCFLAGS="$CFLAGS"
test "$needmdynamicnopic" = yes && add_cflags -mdynamic-no-pic test "$needmdynamicnopic" = yes && add_cflags -mdynamic-no-pic
echo "OPTFLAGS=$CFLAGS" >> config.mak echo "OPTFLAGS=$CFLAGS" >> config.mak
echo "SHCFLAGS=$SHCFLAGS">>config.mak echo "VHOOKCFLAGS=$VHOOKCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "BUILD_STATIC=$lstatic" >> config.mak echo "BUILD_STATIC=$lstatic" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak

4
vhook/Makefile
View File

@ -2,7 +2,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook 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 -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
@ -35,7 +35,7 @@ uninstall:
-rmdir "$(shlibdir)/vhook/" -rmdir "$(shlibdir)/vhook/"
%$(SLIBSUF): %.o %$(SLIBSUF): %.o
$(CC) $(LDFLAGS) -g -o $@ $(VHOOKFLAGS) $< $(CC) $(LDFLAGS) -g -o $@ $(VHOOKSHFLAGS) $<
clean: clean:
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll