[rtmpdump] r75 - in trunk: Makefile hand2.c handshake.h rtmp.c rtmp.h rtmp2.c rtmp2.h rtmpd2.c rtmpdump.c

[hyc]

Author: hyc
Date: Wed Dec 16 21:38:58 2009
New Revision: 75

Log:
Drop C++ from Makefile

Added:
   trunk/handshake.h
      - copied unchanged from r73, trunk/hand2.c
   trunk/rtmp.c
      - copied, changed from r73, trunk/rtmp2.c
   trunk/rtmp.h
      - copied unchanged from r73, trunk/rtmp2.h
   trunk/rtmpdump.c
      - copied, changed from r73, trunk/rtmpd2.c
Deleted:
   trunk/hand2.c
   trunk/rtmp2.c
   trunk/rtmp2.h
   trunk/rtmpd2.c
Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Dec 16 21:34:35 2009	(r74)
+++ trunk/Makefile	Wed Dec 16 21:38:58 2009	(r75)
@@ -1,10 +1,8 @@
 CC=$(CROSS_COMPILE)gcc
-CXX=$(CROSS_COMPILE)g++
 LD=$(CROSS_COMPILE)ld
 
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
-CXXFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)
 LIBS=-lcrypto
 THREADLIB=-lpthread
@@ -19,7 +17,7 @@ all:
 	@echo '    "make cygwin" for a CygWin build, or'
 	@echo '    "make arm"   for a cross-compiled Linux ARM build'
 
-progs:	rtmpdump streams
+progs:	rtmpdump
 
 linux:
 	@$(MAKE) $(MAKEFLAGS) progs
@@ -42,23 +40,14 @@ clean:
 streams: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o streams.o parseurl.o dh.o handshake.o
 	$(CXX) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
-rtmpdump: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o rtmpdump.o parseurl.o dh.o handshake.o
-	$(CXX) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
-
-rtmpd2: bytes.o log.o rtmp2.o dh.o amf.o rtmpd2.o parseurl.o
+rtmpdump: log.o rtmp.o dh.o amf.o bytes.o rtmpdump.o parseurl.o
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
 
 bytes.o: bytes.c bytes.h Makefile
 log.o: log.c log.h Makefile
-rtmp.o: rtmp.cpp rtmp.h log.h AMFObject.h Makefile
-AMFObject.o: AMFObject.cpp AMFObject.h log.h rtmp.h Makefile
-rtmppacket.o: rtmppacket.cpp rtmppacket.h log.h Makefile
-rtmpdump.o: rtmpdump.cpp rtmp.h log.h AMFObject.h Makefile
 parseurl.o: parseurl.c parseurl.h log.h Makefile
 streams.o: streams.cpp rtmp.h log.h Makefile
 dh.o: dh.c dh.h log.h Makefile
-handshake.o: handshake.cpp rtmp.h log.h Makefile
-
-rtmp2.o: rtmp2.c rtmp2.h hand2.c log.h amf.h Makefile
+rtmp.o: rtmp.c rtmp.h handshake.h log.h amf.h Makefile
 amf.o: amf.c amf.h Makefile
-rtmpd2.o: rtmpd2.c rtmp2.h log.h amf.h Makefile
+rtmpdump.o: rtmpdump.c rtmp.h log.h amf.h Makefile

Copied and modified: trunk/rtmp.c (from r73, trunk/rtmp2.c)
==============================================================================
--- trunk/rtmp2.c	Wed Dec 16 21:26:39 2009	(r73, copy source)
+++ trunk/rtmp.c	Wed Dec 16 21:38:58 2009	(r75)
@@ -39,7 +39,7 @@
 #include <sys/times.h>
 #endif
 
-#include "rtmp2.h"
+#include "rtmp.h"
 #include "log.h"
 #include "bytes.h"
 
@@ -1930,7 +1930,7 @@ EncodeBoolean(char *output, const AVal *
 }
 
 #ifdef CRYPTO
-#include "hand2.c"
+#include "handshake.h"
 #else
 static bool
 HandShake(RTMP * r, bool FP9HandShake)

Copied and modified: trunk/rtmpdump.c (from r73, trunk/rtmpd2.c)
==============================================================================
--- trunk/rtmpd2.c	Wed Dec 16 21:26:39 2009	(r73, copy source)
+++ trunk/rtmpdump.c	Wed Dec 16 21:38:58 2009	(r75)
@@ -41,7 +41,7 @@
 #define	SET_BINMODE(f)
 #endif
 
-#include "rtmp2.h"
+#include "rtmp.h"
 #include "log.h"
 #include "parseurl.h"