From 41f439b0a1926265c27a608e119eddb9fae5d772 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 29 Nov 2005 17:47:06 +0000 Subject: [PATCH] Rename gstnet-tempname to gstnet. Fixes #322257. Original commit message from CVS: 2005-11-29 Andy Wingo * check/Makefile.am: * pkgconfig/gstreamer-net-uninstalled.pc.in: * pkgconfig/gstreamer-net.pc.in: * gst/net/Makefile.am: Rename gstnet-tempname to gstnet. Fixes #322257. --- ChangeLog | 8 ++++++++ check/Makefile.am | 4 ++-- gst/net/Makefile.am | 16 +++++++--------- libs/gst/net/Makefile.am | 16 +++++++--------- pkgconfig/gstreamer-net-uninstalled.pc.in | 2 +- pkgconfig/gstreamer-net.pc.in | 2 +- tests/check/Makefile.am | 4 ++-- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index d13a73dd38..fcdfe31be0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-29 Andy Wingo + + * check/Makefile.am: + * pkgconfig/gstreamer-net-uninstalled.pc.in: + * pkgconfig/gstreamer-net.pc.in: + * gst/net/Makefile.am: Rename gstnet-tempname to gstnet. Fixes + #322257. + 2005-11-29 Thomas Vander Stichele * tools/Makefile.am: diff --git a/check/Makefile.am b/check/Makefile.am index 50b66911fb..e563c69fb7 100644 --- a/check/Makefile.am +++ b/check/Makefile.am @@ -86,10 +86,10 @@ gst_libs_controller_LDADD = \ $(LDADD) net_gstnetclientclock_LDADD = \ - $(top_builddir)/gst/net/libgstnet-tempname-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(LDADD) net_gstnettimeprovider_LDADD = \ - $(top_builddir)/gst/net/libgstnet-tempname-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(LDADD) # valgrind testing diff --git a/gst/net/Makefile.am b/gst/net/Makefile.am index 55137e83a7..e3ef286700 100644 --- a/gst/net/Makefile.am +++ b/gst/net/Makefile.am @@ -1,20 +1,18 @@ -# tempname needs to be removed as soon as the old gstnet is renamed to -# nethelper or something -lib_LTLIBRARIES = libgstnet-tempname-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la -libgstnet_tempname_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/net -libgstnet_tempname_@GST_MAJORMINOR@_include_HEADERS = \ +libgstnet_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/net +libgstnet_@GST_MAJORMINOR@_include_HEADERS = \ gstnet.h \ gstnetclientclock.h \ gstnettimepacket.h \ gstnettimeprovider.h -libgstnet_tempname_@GST_MAJORMINOR@_la_SOURCES = \ +libgstnet_@GST_MAJORMINOR@_la_SOURCES = \ gstnetclientclock.c \ gstnettimepacket.c \ gstnettimeprovider.c -libgstnet_tempname_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) +libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) +libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 55137e83a7..e3ef286700 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -1,20 +1,18 @@ -# tempname needs to be removed as soon as the old gstnet is renamed to -# nethelper or something -lib_LTLIBRARIES = libgstnet-tempname-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la -libgstnet_tempname_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/net -libgstnet_tempname_@GST_MAJORMINOR@_include_HEADERS = \ +libgstnet_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/net +libgstnet_@GST_MAJORMINOR@_include_HEADERS = \ gstnet.h \ gstnetclientclock.h \ gstnettimepacket.h \ gstnettimeprovider.h -libgstnet_tempname_@GST_MAJORMINOR@_la_SOURCES = \ +libgstnet_@GST_MAJORMINOR@_la_SOURCES = \ gstnetclientclock.c \ gstnettimepacket.c \ gstnettimeprovider.c -libgstnet_tempname_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) +libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) +libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/pkgconfig/gstreamer-net-uninstalled.pc.in b/pkgconfig/gstreamer-net-uninstalled.pc.in index 79de73edc2..7f5f2bfa2e 100644 --- a/pkgconfig/gstreamer-net-uninstalled.pc.in +++ b/pkgconfig/gstreamer-net-uninstalled.pc.in @@ -9,5 +9,5 @@ Description: Network-enabled GStreamer plug-ins and clocking, uninstalled Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ -Libs: ${libdir}/gst/net/libgstnet-tempname-@GST_MAJORMINOR@.la +Libs: ${libdir}/gst/net/libgstnet-@GST_MAJORMINOR@.la Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-net.pc.in b/pkgconfig/gstreamer-net.pc.in index 69539b6f5e..4594d11392 100644 --- a/pkgconfig/gstreamer-net.pc.in +++ b/pkgconfig/gstreamer-net.pc.in @@ -7,5 +7,5 @@ Name: GStreamer networking library Description: Network-enabled GStreamer plug-ins and clocking Requires: gstreamer-@GST_MAJORMINOR@ Version: @VERSION@ -Libs: -L${libdir} -lgstnet-tempname-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstnet-@GST_MAJORMINOR@ Cflags: -I${includedir} diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 50b66911fb..e563c69fb7 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -86,10 +86,10 @@ gst_libs_controller_LDADD = \ $(LDADD) net_gstnetclientclock_LDADD = \ - $(top_builddir)/gst/net/libgstnet-tempname-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(LDADD) net_gstnettimeprovider_LDADD = \ - $(top_builddir)/gst/net/libgstnet-tempname-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(LDADD) # valgrind testing