mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
clutter: update to 1.18.2
* Updated Ross's install-examples.patch to current ** AM_CPPFLAGS changes no longer needed ** example_DATA = ... redhand.png no longer needed ** minor line # changes (From OE-Core rev: 7a15b1855021eec9dd292bb76c0543a886e9c2ad) Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b7a33b798b
commit
6ae56f21f1
@@ -7,22 +7,12 @@ diff --git a/examples/Makefile.am b/examples/Makefile.am
|
||||
index 4b9b449..232cd19 100644
|
||||
--- a/examples/Makefile.am
|
||||
+++ b/examples/Makefile.am
|
||||
@@ -31,7 +31,7 @@ LDADD = \
|
||||
AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
|
||||
+ -DTESTS_DATADIR=\""$(exampledir)"\" \
|
||||
-DG_DISABLE_SINGLE_INCLUDES \
|
||||
-DGLIB_DISABLE_DEPRECATION_WARNINGS \
|
||||
-I$(top_srcdir) \
|
||||
@@ -39,6 +39,8 @@ AM_CPPFLAGS = \
|
||||
@@ -38,6 +38,7 @@ AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/clutter \
|
||||
-I$(top_builddir)/clutter
|
||||
|
||||
-noinst_PROGRAMS = $(all_examples)
|
||||
+exampledir = $(pkglibdir)/examples
|
||||
+example_PROGRAMS = $(all_examples)
|
||||
+example_DATA = $(top_srcdir)/tests/data/redhand.png
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
EXTRA_DIST = redhand.png
|
||||
|
||||
Reference in New Issue
Block a user