From 91a678fccbb411ae1211a0407fe9ecb3f1020cf5 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 14 Feb 2011 21:44:06 +0100 Subject: [PATCH] Makefiles fixed en zo --- Connector_HTTP/HTTP_Conn | 38 +++++++++++++++++++++++++ Connector_HTTP/Makefile | 6 ++++ Connector_RAW/Makefile | 3 ++ Connector_RTMP/Makefile | 6 ++-- Connector_RTMP/{Conn_RTMP => RTMP_Conn} | 0 Connector_RTMP/main.cpp | 2 +- Makefile | 7 +++-- 7 files changed, 55 insertions(+), 7 deletions(-) create mode 100755 Connector_HTTP/HTTP_Conn rename Connector_RTMP/{Conn_RTMP => RTMP_Conn} (100%) diff --git a/Connector_HTTP/HTTP_Conn b/Connector_HTTP/HTTP_Conn new file mode 100755 index 00000000..e06cbc29 --- /dev/null +++ b/Connector_HTTP/HTTP_Conn @@ -0,0 +1,38 @@ +#!/bin/sh +# +# description: DDVTech HTTP Connector +# processname: Connector_HTTP + +prog="Connector_HTTP" +fullprog="/usr/bin/Connector_HTTP" +RETVAL=0 + +start() { + echo "Starting $prog" + $fullprog + return $? +} + +stop() { + echo "Stopping $prog" + killall $prog + return $? +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + RETVAL=1 +esac + +exit $RETVAL diff --git a/Connector_HTTP/Makefile b/Connector_HTTP/Makefile index c56329e5..8a0e052e 100644 --- a/Connector_HTTP/Makefile +++ b/Connector_HTTP/Makefile @@ -16,3 +16,9 @@ $(OUT): $(OBJ) $(CC) $(LIBS) -o $(OUT) $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ +install: $(OUT) + -service RTMP_Conn stop + cp -f ./$(OUT) /usr/bin/ + cp -f ./HTTP_Conn /etc/init.d/ + service HTTP_Conn start + diff --git a/Connector_RAW/Makefile b/Connector_RAW/Makefile index 90349c29..fc992f72 100644 --- a/Connector_RAW/Makefile +++ b/Connector_RAW/Makefile @@ -16,3 +16,6 @@ $(OUT): $(OBJ) $(CC) $(LIBS) -o $(OUT) $(OBJ) clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ +install: $(OUT) + cp -f ./$(OUT) /usr/bin/ + diff --git a/Connector_RTMP/Makefile b/Connector_RTMP/Makefile index 65d7cf48..c74dc1aa 100644 --- a/Connector_RTMP/Makefile +++ b/Connector_RTMP/Makefile @@ -17,7 +17,7 @@ $(OUT): $(OBJ) chunkstream.cpp parsechunks.cpp handshake.cpp crypto.cpp amf.cpp clean: rm -rf $(OBJ) $(OUT) Makefile.bak *~ install: $(OUT) - -service Conn_RTMP stop + -service RTMP_Conn stop cp -f ./$(OUT) /usr/bin/ - cp -f ./Conn_RTMP /etc/init.d/ - service Conn_RTMP start + cp -f ./RTMP_Conn /etc/init.d/ + service RTMP_Conn start diff --git a/Connector_RTMP/Conn_RTMP b/Connector_RTMP/RTMP_Conn similarity index 100% rename from Connector_RTMP/Conn_RTMP rename to Connector_RTMP/RTMP_Conn diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp index e7e246c0..59061e0c 100644 --- a/Connector_RTMP/main.cpp +++ b/Connector_RTMP/main.cpp @@ -4,7 +4,7 @@ //debugging level 3 = status information //debugging level 4 = extremely verbose status information //debugging level 5 = save all streams to FLV files -#define DEBUG 4 +#define DEBUG 3 #include #include diff --git a/Makefile b/Makefile index 2dbb804f..398f0c06 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,11 @@ client-install: client-clean client chmod 777 /tmp/cores echo "/tmp/cores/%e.%s.%p" > /proc/sys/kernel/core_pattern service xinetd stop - cp -f ./Connector_HTTP/Connector_HTTP /usr/bin/ cd Connector_RTMP; $(MAKE) install - cp -f ./Connector_RAW/Connector_RAW /usr/bin/ + cd Connector_HTTP; $(MAKE) install + cd Connector_RAW; $(MAKE) install #cp -f ./Connector_RTSP/Connector_RTSP /usr/bin/ cp -f ./Buffer/Buffer /usr/bin/ - cp -f ./PLS /etc/xinetd.d/ + rn -rf /etc/xinetd.d/PLS service xinetd start +