[rtmpdump] branch master updated. 9931c44 Generate and install an import lib for the built DLL

[gitolite]

The branch, master has been updated
       via  9931c44867d157621ae10cf489ba336091dfab6b (commit)
       via  749018b7c7c4e0090ea17c104dc094ab74326c08 (commit)
       via  ed99ad05b34031fac74230760c77d4d1a6a9e706 (commit)
      from  a2fb387404cb0da99cf439d58478fff701398700 (commit)


- Log -----------------------------------------------------------------
commit 9931c44867d157621ae10cf489ba336091dfab6b
Author:     Martin Storsjo <martin at martin.st>
AuthorDate: Sat Apr 30 14:30:01 2011 +0300
Commit:     Howard Chu <hyc at highlandsun.com>
CommitDate: Fri Jul 22 14:06:21 2011 -0700

    Generate and install an import lib for the built DLL

diff --git a/librtmp/Makefile b/librtmp/Makefile
index aa4a339..b88baf4 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -54,9 +54,14 @@ SODIR=$(SODIR_$(SYS))
 SO_LDFLAGS_posix=-shared -Wl,-soname,$@
 SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \
 	-headerpad_max_install_names
-SO_LDFLAGS_mingw=-shared
+SO_LDFLAGS_mingw=-shared -Wl,--out-implib,librtmp.dll.a
 SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
 
+INSTALL_IMPLIB_posix=
+INSTALL_IMPLIB_darwin=
+INSTALL_IMPLIB_mingw=cp librtmp.dll.a $(LIBDIR)
+INSTALL_IMPLIB=$(INSTALL_IMPLIB_$(SYS))
+
 SHARED=yes
 SODEF_yes=-fPIC
 SOLIB_yes=librtmp.$(SO_EXT)
@@ -108,5 +113,6 @@ install_base:	librtmp.a librtmp.pc
 
 install_so:	librtmp.$(SO_EXT)
 	cp librtmp.$(SO_EXT) $(SODIR)
+	$(INSTALL_IMPLIB)
 	cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX)
 

commit 749018b7c7c4e0090ea17c104dc094ab74326c08
Author:     Martin Storsjo <martin at martin.st>
AuthorDate: Sat Apr 30 14:30:00 2011 +0300
Commit:     Howard Chu <hyc at highlandsun.com>
CommitDate: Fri Jul 22 14:06:12 2011 -0700

    Create the SODIR, too
    
    When SYS=mingw, this differs from LIBDIR.

diff --git a/librtmp/Makefile b/librtmp/Makefile
index c95c8a6..aa4a339 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -100,7 +100,7 @@ librtmp.pc: librtmp.pc.in Makefile
 install:	install_base $(SO_INST)
 
 install_base:	librtmp.a librtmp.pc
-	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
+	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
 	cp amf.h http.h log.h rtmp.h $(INCDIR)
 	cp librtmp.a $(LIBDIR)
 	cp librtmp.pc $(LIBDIR)/pkgconfig

commit ed99ad05b34031fac74230760c77d4d1a6a9e706
Author:     Martin Storsjo <martin at martin.st>
AuthorDate: Sat Apr 30 14:29:58 2011 +0300
Commit:     Howard Chu <hyc at highlandsun.com>
CommitDate: Fri Jul 22 14:05:36 2011 -0700

    Remove the generated pkg-config file on make clean

diff --git a/librtmp/Makefile b/librtmp/Makefile
index d61e7a4..c95c8a6 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -76,7 +76,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
 all:	librtmp.a $(SO_LIB)
 
 clean:
-	rm -f *.o *.a *.$(SOX) *.$(SO_EXT)
+	rm -f *.o *.a *.$(SOX) *.$(SO_EXT) librtmp.pc
 
 librtmp.a: $(OBJS)
 	$(AR) rs $@ $?

-----------------------------------------------------------------------

Summary of changes:
 librtmp/Makefile |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
--