[Ffmpeg-cvslog] r5745 - in trunk: configure vhook/Makefile

[diego]

Author: diego
Date: Fri Jul 14 18:18:59 2006
New Revision: 5745

Modified:
   trunk/configure
   trunk/vhook/Makefile

Log:
Properly handle vhook build flags for platforms that require special handling.
Removes one of the last FIXMEs from the build system.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Jul 14 18:18:59 2006
@@ -440,6 +440,7 @@
 dlopen="no"
 mpegaudio_hp="yes"
 SHFLAGS='-shared -Wl,-soname,$@'
+VHOOKFLAGS="$SHFLAGS"
 netserver="no"
 need_inet_aton="no"
 protocols="yes"
@@ -569,6 +570,7 @@
 audio_oss="no"
 dv1394="no"
 SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(libdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
+VHOOKFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@'
 extralibs=""
 darwin="yes"
 strip="strip -x"
@@ -1581,6 +1583,7 @@
 echo "LDCONFIG=$LDCONFIG" >> config.mak
 echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
+echo "VHOOKFLAGS=$VHOOKFLAGS" >> 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	Fri Jul 14 18:18:59 2006
@@ -5,12 +5,6 @@
 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 @@
 	-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