[Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile,1.112,1.113

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv13674/libavformat

Modified Files:
	Makefile 
Log Message:
On MinGW it is not possible to build shared and static libraries at once.
Add means to disable building the static libraries and fix a few issues
with the MinGW build.
All the hard work done by Alexander Strasser, minor changes by myself.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- Makefile	29 Jan 2006 18:32:55 -0000	1.112
+++ Makefile	30 Jan 2006 00:22:41 -0000	1.113
@@ -10,7 +10,7 @@
 
 #FIXME: This should be in configure/config.mak
 ifeq ($(CONFIG_WIN32),yes)
-    LDFLAGS=-Wl,--output-def,$(@:.dll=.def)
+    LDFLAGS=-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
 endif
 
 OBJS= utils.o cutils.o os_support.o allformats.o
@@ -157,7 +157,8 @@
 	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 
 clean:
-	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
+	      *.lib *.def *.dll.a *.exp
 
 distclean: clean
 	rm -f .depend