diff --git a/ChangeLog b/ChangeLog index ae106ed1f0..4e7739efe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-09 Andy Wingo + + * configure.ac: + * gst-libs/gst/Makefile.am: + * gst-libs/gst/net/Makefile.am: + Add gstnet to build. + 2005-06-09 Andy Wingo * gst-libs/gst/gconf/gconf.c: diff --git a/configure.ac b/configure.ac index 8519e9dfb4..ad0951cfab 100644 --- a/configure.ac +++ b/configure.ac @@ -894,6 +894,7 @@ gst-libs/gst/floatcast/Makefile gst-libs/gst/gconf/Makefile gst-libs/gst/mixer/Makefile gst-libs/gst/navigation/Makefile +gst-libs/gst/net/Makefile gst-libs/gst/propertyprobe/Makefile gst-libs/gst/riff/Makefile gst-libs/gst/tag/Makefile diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index 951890f157..aa280ce0d8 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -11,6 +11,7 @@ SUBDIRS = \ $(GCONF_DIR) \ mixer \ navigation \ + net \ propertyprobe \ riff \ tag \ @@ -26,6 +27,7 @@ DIST_SUBDIRS = \ gconf \ mixer \ navigation \ + net \ propertyprobe \ riff \ tag \ diff --git a/gst-libs/gst/net/Makefile.am b/gst-libs/gst/net/Makefile.am index c04a1dc954..e47708f582 100644 --- a/gst-libs/gst/net/Makefile.am +++ b/gst-libs/gst/net/Makefile.am @@ -4,8 +4,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h noinst_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la -libgstnet_la_SOURCES = gstnetbuffer.c - libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index c04a1dc954..e47708f582 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -4,8 +4,6 @@ libgstnetinclude_HEADERS = gstnetbuffer.h noinst_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la -libgstnet_la_SOURCES = gstnetbuffer.c - libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)