| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 |
| 2 | From: Carlos <carlos.rodriguez@ridgerun.com> |
| 3 | Date: Fri, 15 Dec 2017 10:14:05 -0600 |
| 4 | Subject: [PATCH] gstd:yocto compatibility |
| 5 | |
| 6 | --- |
| 7 | autogen.sh | 8 +++++++- |
| 8 | docs/reference/gstd/Makefile.am | 2 +- |
| 9 | gstd/Makefile.am | 2 +- |
| 10 | 3 files changed, 9 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/autogen.sh b/autogen.sh |
| 13 | index 66dbd42..793ee2f 100755 |
| 14 | --- a/autogen.sh |
| 15 | +++ b/autogen.sh |
| 16 | @@ -21,7 +21,11 @@ |
| 17 | # ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them |
| 18 | # unset and get the defaults |
| 19 | |
| 20 | -gtkdocize || exit 1 |
| 21 | +test -n "$srcdir" || srcdir=`dirname "$0"` |
| 22 | +test -n "$srcdir" || srcdir=. |
| 23 | + |
| 24 | +olddir=`pwd` |
| 25 | +cd "$srcdir" |
| 26 | |
| 27 | autoreconf --verbose --force --install || { |
| 28 | echo 'autogen.sh failed'; |
| 29 | @@ -31,3 +35,5 @@ autoreconf --verbose --force --install || { |
| 30 | echo |
| 31 | echo "Now run './configure' with your system settings followed by 'make' to compile this module." |
| 32 | echo |
| 33 | + |
| 34 | +cd "$olddir" |
| 35 | diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am |
| 36 | index f860fa1..153a13b 100644 |
| 37 | --- a/docs/reference/gstd/Makefile.am |
| 38 | +++ b/docs/reference/gstd/Makefile.am |
| 39 | @@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la |
| 40 | |
| 41 | |
| 42 | # This includes the standard gtk-doc make rules, copied by gtkdocize. |
| 43 | -include $(top_srcdir)/docs/gtk-doc.make |
| 44 | +# include $(top_srcdir)/docs/gtk-doc.make |
| 45 | |
| 46 | # Comment this out if you want 'make check' to test you doc status |
| 47 | # and run some sanity checks |
| 48 | diff --git a/gstd/Makefile.am b/gstd/Makefile.am |
| 49 | index 13c551d..11fe202 100644 |
| 50 | --- a/gstd/Makefile.am |
| 51 | +++ b/gstd/Makefile.am |
| 52 | @@ -49,7 +49,7 @@ bin_PROGRAMS = gstd |
| 53 | |
| 54 | gstd_SOURCES = gstd.c |
| 55 | gstd_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) $(GJSON_CFLAGS) |
| 56 | -gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) -Wl,-rpath -Wl,$(libdir) |
| 57 | +gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) |
| 58 | gstd_LDADD = libgstd-core.la |
| 59 | |
| 60 | gstdincludedir = $(includedir)/gstd |
| 61 | -- |
| 62 | 1.9.1 |
| 63 | |