Drop C++ from Makefile
authorhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Wed, 16 Dec 2009 20:38:58 +0000 (20:38 +0000)
committerhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Wed, 16 Dec 2009 20:38:58 +0000 (20:38 +0000)
git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@75 400ebc74-4327-4243-bc38-086b20814532

Makefile
handshake.h [moved from hand2.c with 100% similarity]
rtmp.c [moved from rtmp2.c with 99% similarity]
rtmp.h [moved from rtmp2.h with 100% similarity]
rtmpdump.c [moved from rtmpd2.c with 99% similarity]

index 95b64a2..b526622 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
similarity index 100%
rename from hand2.c
rename to handshake.h
diff --git a/rtmp2.c b/rtmp.c
similarity index 99%
rename from rtmp2.c
rename to rtmp.c
index cb8abd5..aba38c8 100644 (file)
--- a/rtmp2.c
+++ b/rtmp.c
@@ -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 * strName, bool bVal)
 }
 
 #ifdef CRYPTO
-#include "hand2.c"
+#include "handshake.h"
 #else
 static bool
 HandShake(RTMP * r, bool FP9HandShake)
diff --git a/rtmp2.h b/rtmp.h
similarity index 100%
rename from rtmp2.h
rename to rtmp.h
similarity index 99%
rename from rtmpd2.c
rename to rtmpdump.c
index 36eec40..0e6e8fb 100644 (file)
--- a/rtmpd2.c
@@ -41,7 +41,7 @@
 #define        SET_BINMODE(f)
 #endif
 
-#include "rtmp2.h"
+#include "rtmp.h"
 #include "log.h"
 #include "parseurl.h"