summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-02-11 22:16:02 +0000
committerDavid Schleef <ds@schleef.org>2005-02-11 22:16:02 +0000
commit3bfd8bf0e859455755ee8e89ddd7e1e51f9cf911 (patch)
tree01b074382df7f67b6f19be37deb15190d5eabce5
parenta970a323047d9241a4ee96f4126c9739fc9780cf (diff)
downloadgst-plugins-bad-3bfd8bf0e859455755ee8e89ddd7e1e51f9cf911.tar.gz
gst-plugins-bad-3bfd8bf0e859455755ee8e89ddd7e1e51f9cf911.tar.bz2
gst-plugins-bad-3bfd8bf0e859455755ee8e89ddd7e1e51f9cf911.zip
gst/librfb/Makefile.am: Testing stuff before committing is for wimps... and people with fast machines. Fix stupid mi...
Original commit message from CVS: * gst/librfb/Makefile.am: Testing stuff before committing is for wimps... and people with fast machines. Fix stupid mistake.
-rw-r--r--ChangeLog6
-rw-r--r--gst/librfb/Makefile.am6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 54db7f60..5ae648ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-02-11 David Schleef <ds@schleef.org>
+ * gst/librfb/Makefile.am: Testing stuff before committing is
+ for wimps... and people with fast machines. Fix stupid
+ mistake.
+
+2005-02-11 David Schleef <ds@schleef.org>
+
* configure.ac: Pull in librfb from my CVS tree, because it is
too small and annoying to be separate. Move rfbsrc plugin
to gst/.
diff --git a/gst/librfb/Makefile.am b/gst/librfb/Makefile.am
index 67505440..720e5cc2 100644
--- a/gst/librfb/Makefile.am
+++ b/gst/librfb/Makefile.am
@@ -4,8 +4,8 @@
noinst_LTLIBRARIES = librfb.la
plugin_LTLIBRARIES = libgstrfbsrc.la
-libgstrfbsrc_la_SOURCES = gstrfbsrc.c
-libgstrfbsrc_la_CFLAGS = $(GST_CFLAGS) -I/usr/local/include/librfb-0.1
+libgstrfbsrc_la_SOURCES = gstrfbsrc.c
+libgstrfbsrc_la_CFLAGS = $(GST_CFLAGS) -I$(srcdir)/..
libgstrfbsrc_la_LIBADD = librfb.la
libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -25,6 +25,6 @@ librfb_la_SOURCES = \
rfbbytestream.c \
rfbbytestream.h
-librfb_la_CFLAGS = $(RFB_CFLAGS)
+librfb_la_CFLAGS = $(GST_CFLAGS) -I$(srcdir)/..
librfb_la_LIBADD = $(GLIB_LIBS)