gst-libs/gst/netbuffer/Makefile.am: Let's not override libgstnet from core for no...

Original commit message from CVS:
* gst-libs/gst/netbuffer/Makefile.am: (libgstnetbufferincludedir):
Let's not override libgstnet from core for no reason...

diff --git a/ChangeLog b/ChangeLog
index 0721e07..20cf095 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-30  Edward Hervey  <edward@fluendo.com>
+
+       * gst-libs/gst/netbuffer/Makefile.am: (libgstnetbufferincludedir): 
+       Let's not override libgstnet from core for no reason...
+
 2005-11-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/common b/common
index 33084fb..8db4c61 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 33084fbe0531733bc02aa1d9de608206d5553a15
+Subproject commit 8db4c613eb1aa57dc21d25a4b83b36e3cdedc5ca

diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index 89367f7..8cbfbd3 100644 (file)
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -1,10 +1,10 @@
-libgstnetincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/netbuffer
+libgstnetbufferincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/netbuffer
 
-libgstnetinclude_HEADERS = gstnetbuffer.h
+libgstnetbufferinclude_HEADERS = gstnetbufferbuffer.h
 
-lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstnetbuffer-@GST_MAJORMINOR@.la
 
-libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c
-libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
-libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstnetbuffer_@GST_MAJORMINOR@_la_SOURCES = gstnetbufferbuffer.c
+libgstnetbuffer_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
+libgstnetbuffer_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
+libgstnetbuffer_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)