rfbsrc: Remove useless library wrapping

We use a sinlge .c file, simplify everything by removing that
static library.

diff --git a/gst/librfb/Makefile.am b/gst/librfb/Makefile.am
index 78498d3..a1d045d 100644 (file)
--- a/gst/librfb/Makefile.am
+++ b/gst/librfb/Makefile.am
@@ -1,24 +1,17 @@
 # please keep librfb easily extractable
 
-noinst_LTLIBRARIES = librfb.la
 plugin_LTLIBRARIES = libgstrfbsrc.la
 
-libgstrfbsrc_la_SOURCES = gstrfbsrc.c
+libgstrfbsrc_la_SOURCES = gstrfbsrc.c \
+       rfbdecoder.c \
+       d3des.c
 libgstrfbsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) -I$(srcdir)/..
 libgstrfbsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
-       $(GST_BASE_LIBS) $(GST_LIBS) $(X11_LIBS) librfb.la
+       $(GST_BASE_LIBS) $(GST_LIBS) $(X11_LIBS)
 libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrfbsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
-librfb_la_SOURCES = \
-       rfbbuffer.c \
-       rfbdecoder.c \
-       d3des.c
-librfb_la_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) -I$(srcdir)/..
-librfb_la_LIBADD = $(GST_LIBS) $(GIO_LIBS)
-
 noinst_HEADERS = \
-       rfb.h \
        rfbdecoder.h \
        gstrfbsrc.h \
        d3des.h

diff --git a/gst/librfb/gstrfbsrc.h b/gst/librfb/gstrfbsrc.h
index a85dc6e..1b62a72 100644 (file)
--- a/gst/librfb/gstrfbsrc.h
+++ b/gst/librfb/gstrfbsrc.h
@@ -25,7 +25,8 @@
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
 #include <gst/video/gstvideopool.h>
-#include <librfb/rfb.h>
+
+#include "rfbdecoder.h"
 
 G_BEGIN_DECLS
 #define GST_TYPE_RFB_SRC \

diff --git a/gst/librfb/rfb.h b/gst/librfb/rfb.h
deleted file mode 100644 (file)
index acb85f6..0000000
--- a/gst/librfb/rfb.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _RFB_RFB_H_
-#define _RFB_RFB_H_
-
-#include <librfb/rfbdecoder.h>
-
-#endif

diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index bc074a5..87b5472 100644 (file)
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include "rfb.h"
+#include "rfbdecoder.h"
 #include "d3des.h"
 #include <gst/gst.h>