[Ffmpeg-cvslog] r6012 - in trunk: configure vhook/Makefile
diego
subversion
Thu Aug 17 17:55:19 CEST 2006
Author: diego
Date: Thu Aug 17 17:55:19 2006
New Revision: 6012
Modified:
trunk/configure
trunk/vhook/Makefile
Log:
Make vhook CFLAGS handling less confusing.
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Aug 17 17:55:19 2006
@@ -439,7 +439,7 @@
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 @@
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 @@
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
Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile (original)
+++ trunk/vhook/Makefile Thu Aug 17 17:55:19 2006
@@ -2,7 +2,7 @@
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 @@
-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
More information about the ffmpeg-cvslog
mailing list