[rtmpdump] r419 - in trunk/librtmp: Makefile rtmp.h

[hyc]

Author: hyc
Date: Wed Apr  7 09:12:59 2010
New Revision: 419

Log:
Move -DCRYPTO to Makefile from rtmp.h

Modified:
   trunk/librtmp/Makefile
   trunk/librtmp/rtmp.h

Modified: trunk/librtmp/Makefile
==============================================================================
--- trunk/librtmp/Makefile	Wed Apr  7 08:56:05 2010	(r418)
+++ trunk/librtmp/Makefile	Wed Apr  7 09:12:59 2010	(r419)
@@ -7,14 +7,20 @@ LD=$(CROSS_COMPILE)ld
 
 CRYPTO=OPENSSL
 #CRYPTO=GNUTLS
+DEF_OPENSSL=-DCRYPTO -DUSE_OPENSSL
+DEF_GNUTLS=-DCRYPTO -DUSE_GNUTLS
 LIB_GNUTLS=-lgnutls
 LIB_OPENSSL=-lssl -lcrypto
+OBJ_OPENSSL=hashswf.o
+OBJ_GNUTLS=hashswf.o
 REQ_GNUTLS=gnutls
 REQ_OPENSSL=libssl,libcrypto
 CRYPTO_LIB=$(LIB_$(CRYPTO))
 CRYPTO_REQ=$(REQ_$(CRYPTO))
+CRYPTO_DEF=$(DEF_$(CRYPTO))
+CRYPTO_OBJ=$(OBJ_$(CRYPTO))
 
-DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" -DUSE_$(CRYPTO)
+DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF)
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 
@@ -25,7 +31,7 @@ all:	librtmp.a
 clean:
 	rm -f *.o *.a
 
-librtmp.a: rtmp.o log.o amf.o hashswf.o parseurl.o
+librtmp.a: rtmp.o log.o amf.o parseurl.o $(CRYPTO_OBJ)
 	$(AR) rs $@ $?
 
 log.o: log.c log.h Makefile

Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h	Wed Apr  7 08:56:05 2010	(r418)
+++ trunk/librtmp/rtmp.h	Wed Apr  7 09:12:59 2010	(r419)
@@ -24,8 +24,6 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
-#define CRYPTO
-
 #include <errno.h>
 #include <stdint.h>
 #include <stddef.h>