[Ffmpeg-cvslog] CVS: ffmpeg/vhook Makefile,1.26,1.27
Diego Biurrun CVS
diego
Thu Jan 12 01:00:02 CET 2006
Update of /cvsroot/ffmpeg/ffmpeg/vhook
In directory mail:/var2/tmp/cvs-serv12265/vhook
Modified Files:
Makefile
Log Message:
Move Darwin shared library build peculiarities to configure.
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile 17 Dec 2005 18:14:38 -0000 1.26
+++ Makefile 12 Jan 2006 00:00:00 -0000 1.27
@@ -4,8 +4,9 @@
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 += -flat_namespace -undefined suppress
+ SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
endif
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
@@ -36,11 +37,7 @@
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
%$(SLIBSUF): %.o
-ifeq ($(CONFIG_DARWIN),yes)
- $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhook/$@ -g -o $@ $<
-else
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
-endif
clean:
rm -f *.o *.d .depend *$(SLIBSUF) *~
More information about the ffmpeg-cvslog
mailing list