examples/glib/Makefile.am - Issue 2120003: Fix dbus-c++ to compile examples in a cross compilation environment

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: examples/glib/Makefile.am

Issue 2120003: Fix dbus-c++ to compile examples in a cross compilation environment (Closed) Base URL: ssh://git@chromiumos-git//dbus-cplusplus.git

Patch Set: Created 10 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: examples/glib/Makefile.am

diff --git a/examples/glib/Makefile.am b/examples/glib/Makefile.am

index 42a33d8edb4959e50ea54e7edca045f79e5ca783..12e1219f684e25f704776623536a07e2af0731e4 100644

--- a/examples/glib/Makefile.am

+++ b/examples/glib/Makefile.am

@@ -1,5 +1,11 @@

EXTRA_DIST =

+if CROSS_COMPILING

+dbusxx_xml2cpp = dbusxx-xml2cpp

+else

+dbusxx_xml2cpp = $(top_builddir)/tools/dbusxx-xml2cpp

+endif

AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(gtkmm_CFLAGS) -I$(top_srcdir)/tools

if HAVE_GTKMM

@@ -10,7 +16,7 @@ dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)

dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)

dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml

- $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@

+ $(dbusxx_xml2cpp) $^ --proxy=$@

BUILT_SOURCES = dbus-glue.h

CLEANFILES = $(BUILT_SOURCES)

« no previous file with comments | « examples/ecore/Makefile.am ('k') | examples/properties/Makefile.am » ('j') | no next file with comments »