[rtmpdump] r437 - in trunk/librtmp: Makefile librtmp.pc.in

[hyc]

Author: hyc
Date: Sun Apr 18 23:10:02 2010
New Revision: 437

Log:
Tweak pkgconfig libs

Modified:
   trunk/librtmp/Makefile
   trunk/librtmp/librtmp.pc.in

Modified: trunk/librtmp/Makefile
==============================================================================
--- trunk/librtmp/Makefile	Sun Apr 18 21:53:20 2010	(r436)
+++ trunk/librtmp/Makefile	Sun Apr 18 23:10:02 2010	(r437)
@@ -11,11 +11,8 @@ CRYPTO=OPENSSL
 DEF_OPENSSL=-DUSE_OPENSSL
 DEF_GNUTLS=-DUSE_GNUTLS
 DEF_=-DNO_CRYPTO
-LIB_GNUTLS=-lgnutls
-LIB_OPENSSL=-lssl -lcrypto
 REQ_GNUTLS=gnutls
 REQ_OPENSSL=libssl,libcrypto
-CRYPTO_LIB=$(LIB_$(CRYPTO))
 CRYPTO_REQ=$(REQ_$(CRYPTO))
 CRYPTO_DEF=$(DEF_$(CRYPTO))
 
@@ -41,8 +38,7 @@ parseurl.o: parseurl.c rtmp.h rtmp_sys.h
 
 librtmp.pc: librtmp.pc.in Makefile
 	sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \
-		-e "s;@CRYPTO_LIB@;$(CRYPTO_LIB);" -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
-		librtmp.pc.in > $@
+		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" librtmp.pc.in > $@
 
 install:	librtmp.a librtmp.pc
 	-mkdir -p $(INCDIR) $(DESTDIR)$(prefix)/lib/pkgconfig

Modified: trunk/librtmp/librtmp.pc.in
==============================================================================
--- trunk/librtmp/librtmp.pc.in	Sun Apr 18 21:53:20 2010	(r436)
+++ trunk/librtmp/librtmp.pc.in	Sun Apr 18 23:10:02 2010	(r437)
@@ -8,6 +8,5 @@ Description: RTMP implementation
 Version: @VERSION@
 Requires: @CRYPTO_REQ@
 URL: http://rtmpdump.mplayerhq.hu
-Libs: -L${libdir} -lrtmp
-Libs.private: @CRYPTO_LIB@ -lz
+Libs: -L${libdir} -lrtmp -lz
 Cflags: -I${incdir}