summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2013-04-06 19:24:21 -0700
committerDavid Schleef <ds@schleef.org>2013-04-06 19:27:19 -0700
commitd309d2d133d94d4b37c98138dc3622801f30f1fb (patch)
tree3296b029f0ae0c56c0b846893b3d914f54e786f9
parent2854b1153446c004397652055b823b3f746e57b4 (diff)
rename grtmp to rtmp
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.am8
-rw-r--r--pkgconfig/gst-rtmp-uninstalled.pc.in2
-rw-r--r--pkgconfig/gst-rtmp.pc.in2
-rw-r--r--rtmp/Makefile.am (renamed from grtmp/Makefile.am)0
-rw-r--r--rtmp/rtmpclient.c (renamed from grtmp/rtmpclient.c)0
-rw-r--r--rtmp/rtmpclient.h (renamed from grtmp/rtmpclient.h)0
-rw-r--r--rtmp/rtmpconnection.c (renamed from grtmp/rtmpconnection.c)0
-rw-r--r--rtmp/rtmpconnection.h (renamed from grtmp/rtmpconnection.h)0
-rw-r--r--rtmp/rtmpserver.c (renamed from grtmp/rtmpserver.c)0
-rw-r--r--rtmp/rtmpserver.h (renamed from grtmp/rtmpserver.h)0
12 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index a481c1c..422f2e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = grtmp tools pkgconfig doc
+SUBDIRS = rtmp tools pkgconfig doc
EXTRA_DIST = autogen.sh gtk-doc.mak HACKING TODO BUGS README
diff --git a/configure.ac b/configure.ac
index b8abeb3..7de7917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ LT_PATH_NM
dnl allow for different autotools
AS_AUTOTOOLS_ALTERNATE
-AC_CONFIG_SRCDIR([grtmp/rtmpserver.c])
+AC_CONFIG_SRCDIR([rtmp/rtmpserver.c])
AC_CONFIG_MACRO_DIR([m4])
ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
@@ -140,7 +140,7 @@ AS_HOST_DEFINES()
AC_CONFIG_FILES([
Makefile
doc/Makefile
-grtmp/Makefile
+rtmp/Makefile
pkgconfig/Makefile
pkgconfig/gst-rtmp-uninstalled.pc
pkgconfig/gst-rtmp.pc
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9ec6e96..61c4ad9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../grtmp
+DOC_SOURCE_DIR=../rtmp
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
@@ -49,8 +49,8 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/grtmp/*.h
-CFILE_GLOB=$(top_srcdir)/grtmp/*.c
+HFILE_GLOB=$(top_srcdir)/rtmp/*.h
+CFILE_GLOB=$(top_srcdir)/rtmp/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -79,7 +79,7 @@ expand_content_files=
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS=$(GSS_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GST_RTSP_SERVER_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/grtmp/libgrtmp-@GST_API_VERSION@.la $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS)
+GTKDOC_LIBS=$(top_builddir)/rtmp/libgstrtmp-@GST_API_VERSION@.la $(GST_LIBS) $(SOUP_LIBS) $(GST_RTSP_SERVER_LIBS) $(JSON_GLIB_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
diff --git a/pkgconfig/gst-rtmp-uninstalled.pc.in b/pkgconfig/gst-rtmp-uninstalled.pc.in
index abbaf98..a0aa9b7 100644
--- a/pkgconfig/gst-rtmp-uninstalled.pc.in
+++ b/pkgconfig/gst-rtmp-uninstalled.pc.in
@@ -8,5 +8,5 @@ Name: gst-rtmp-@GST_API_VERSION@ uninstalled
Description: GStreamer RTMP Library (uninstalled)
Version: @VERSION@
Requires: libsoup-2.4
-Libs: -L${libdir} -lgrtmp-@GST_API_VERSION@
+Libs: -L${libdir} -lgst-rtmp-@GST_API_VERSION@
Cflags: -I${includedir}
diff --git a/pkgconfig/gst-rtmp.pc.in b/pkgconfig/gst-rtmp.pc.in
index efa5d4f..c603a03 100644
--- a/pkgconfig/gst-rtmp.pc.in
+++ b/pkgconfig/gst-rtmp.pc.in
@@ -9,5 +9,5 @@ Name: gst-rtmp-@GST_API_VERSION@
Description: GStreamer RTMP Library
Version: @VERSION@
Requires: libsoup-2.4
-Libs: -L${libdir} -lgrtmp-@GST_API_VERSION@
+Libs: -L${libdir} -lgst-rtmp-@GST_API_VERSION@
Cflags: -I${includedir}
diff --git a/grtmp/Makefile.am b/rtmp/Makefile.am
index 9529a35..9529a35 100644
--- a/grtmp/Makefile.am
+++ b/rtmp/Makefile.am
diff --git a/grtmp/rtmpclient.c b/rtmp/rtmpclient.c
index defbd23..defbd23 100644
--- a/grtmp/rtmpclient.c
+++ b/rtmp/rtmpclient.c
diff --git a/grtmp/rtmpclient.h b/rtmp/rtmpclient.h
index 7acf2ae..7acf2ae 100644
--- a/grtmp/rtmpclient.h
+++ b/rtmp/rtmpclient.h
diff --git a/grtmp/rtmpconnection.c b/rtmp/rtmpconnection.c
index 1d01875..1d01875 100644
--- a/grtmp/rtmpconnection.c
+++ b/rtmp/rtmpconnection.c
diff --git a/grtmp/rtmpconnection.h b/rtmp/rtmpconnection.h
index 522d0bd..522d0bd 100644
--- a/grtmp/rtmpconnection.h
+++ b/rtmp/rtmpconnection.h
diff --git a/grtmp/rtmpserver.c b/rtmp/rtmpserver.c
index d643c3d..d643c3d 100644
--- a/grtmp/rtmpserver.c
+++ b/rtmp/rtmpserver.c
diff --git a/grtmp/rtmpserver.h b/rtmp/rtmpserver.h
index 596f231..596f231 100644
--- a/grtmp/rtmpserver.h
+++ b/rtmp/rtmpserver.h