diff options
| author | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2013-11-15 13:37:15 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2013-11-15 15:55:37 -0300 |
| commit | 5ecb58e60f50299d7ad3a1cdb857be92e3a24380 (patch) | |
| tree | b0ce22ae1d3391535f98fabb0f848c086243751f | |
| parent | ba407b7ef640702ea9ea45de642551a6e550dcae (diff) | |
gss: Change name for tool/gss-server files
gss-server is present on some distros already. Debian,
for example, has it for packages krb5-gss-samples and
libgssapi-perl. General idea is for GStreamer binaries
to have the gst- prefix.
| -rw-r--r-- | debian/gst-streaming-server.upstart | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rwxr-xr-x | tests/test.py | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 12 | ||||
| -rw-r--r-- | tools/gst-streaming-server.c (renamed from tools/gss-server.c) | 2 | ||||
| -rw-r--r-- | tools/gst-streaming-server.h (renamed from tools/gss-server.h) | 0 |
6 files changed, 12 insertions, 12 deletions
diff --git a/debian/gst-streaming-server.upstart b/debian/gst-streaming-server.upstart index 51822ec..12f5afc 100644 --- a/debian/gst-streaming-server.upstart +++ b/debian/gst-streaming-server.upstart @@ -20,10 +20,10 @@ env HTTP_PORT=80 env HTTPS_PORT=443 pre-start script - [ -x /usr/bin/gss-server ] + [ -x /usr/bin/gst-streaming-server ] end script -exec /usr/bin/gss-server --http-port $HTTP_PORT --https-port $HTTPS_PORT +exec /usr/bin/gst-streaming-server --http-port $HTTP_PORT --https-port $HTTPS_PORT diff --git a/po/POTFILES.in b/po/POTFILES.in index 4d29dfb..952d699 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1 @@ -tools/gss-server.c +tools/gst-streaming-server.c diff --git a/tests/test.py b/tests/test.py index 4fc434a..c91b606 100755 --- a/tests/test.py +++ b/tests/test.py @@ -38,8 +38,8 @@ def test_get_checksum_range(url, start, end, expected_checksum): assert m.hexdigest() == expected_checksum -#args = ['../tools/gss-server'] -#pid = os.spawnv(os.P_NOWAIT, "../tools/gss-server", args) +#args = ['../tools/gst-streaming-server'] +#pid = os.spawnv(os.P_NOWAIT, "../tools/gst-streaming-server", args) #print "PID is %d" % (pid,) #time.sleep(2) diff --git a/tools/Makefile.am b/tools/Makefile.am index 2b63cd8..c068064 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,17 +1,17 @@ bin_PROGRAMS = \ - gss-server \ + gst-streaming-server \ gss-transcoder noinst_PROGRAMS = \ vts-server gss-info gss-isom-tool -gss_server_CFLAGS = $(GSS_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GST_RTSP_SERVER_CFLAGS) $(JSON_GLIB_CFLAGS) -gss_server_LDADD = $(GSS_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS) -gss_server_SOURCES = \ - gss-server.c \ - gss-server.h +gst_streaming_server_CFLAGS = $(GSS_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GST_RTSP_SERVER_CFLAGS) $(JSON_GLIB_CFLAGS) +gst_streaming_server_LDADD = $(GSS_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS) +gst_streaming_server_SOURCES = \ + gst-streaming-server.c \ + gst-streaming-server.h vts_server_CFLAGS = $(GSS_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GST_RTSP_SERVER_CFLAGS) $(JSON_GLIB_CFLAGS) vts_server_LDADD = $(GSS_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS) diff --git a/tools/gss-server.c b/tools/gst-streaming-server.c index bf7d4ad..869767a 100644 --- a/tools/gss-server.c +++ b/tools/gst-streaming-server.c @@ -22,7 +22,7 @@ #include "config.h" #endif -#include "gss-server.h" +#include "gst-streaming-server.h" #include "gst-streaming-server/gss-user.h" #include "gst-streaming-server/gss-log.h" #include "gst-streaming-server/gss-manager.h" diff --git a/tools/gss-server.h b/tools/gst-streaming-server.h index e40af8d..e40af8d 100644 --- a/tools/gss-server.h +++ b/tools/gst-streaming-server.h |