rfbsrc: Remove useless library wrapping

We use a sinlge .c file, simplify everything by removing that
static library.
This commit is contained in:
Nicolas Dufresne 2016-03-16 16:49:29 -04:00
parent 29f1ca8602
commit 4e0a5c101f
4 changed files with 7 additions and 19 deletions

View file

@ -1,24 +1,17 @@
# please keep librfb easily extractable # please keep librfb easily extractable
noinst_LTLIBRARIES = librfb.la
plugin_LTLIBRARIES = libgstrfbsrc.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_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) \ 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_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstrfbsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) 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 = \ noinst_HEADERS = \
rfb.h \
rfbdecoder.h \ rfbdecoder.h \
gstrfbsrc.h \ gstrfbsrc.h \
d3des.h d3des.h

View file

@ -25,7 +25,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstpushsrc.h> #include <gst/base/gstpushsrc.h>
#include <gst/video/gstvideopool.h> #include <gst/video/gstvideopool.h>
#include <librfb/rfb.h>
#include "rfbdecoder.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_RFB_SRC \ #define GST_TYPE_RFB_SRC \

View file

@ -1,6 +0,0 @@
#ifndef _RFB_RFB_H_
#define _RFB_RFB_H_
#include <librfb/rfbdecoder.h>
#endif

View file

@ -2,7 +2,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "rfb.h" #include "rfbdecoder.h"
#include "d3des.h" #include "d3des.h"
#include <gst/gst.h> #include <gst/gst.h>