Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: examples/properties/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
« no previous file with comments | « examples/glib/Makefile.am ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/properties/Makefile.am
diff --git a/examples/properties/Makefile.am b/examples/properties/Makefile.am
index a99749a19f191c29b6d6b350e32449b871b5135b..45fca8235f6501d0a426569803f8a0f033599c0c 100644
--- a/examples/properties/Makefile.am
+++ b/examples/properties/Makefile.am
@@ -1,5 +1,11 @@
EXTRA_DIST = propsgs-introspect.xml
+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
noinst_PROGRAMS = propsgs-server propsgs-client
@@ -11,10 +17,10 @@ propsgs_client_SOURCES = propsgs-glue-proxy.h propsgs-client.h propsgs-client.cp
propsgs_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la -lpthread
propsgs-glue-adaptor.h: propsgs-introspect.xml
- $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ --
+ $(dbusxx_xml2cpp) $^ --adaptor=$@ --
propsgs-glue-proxy.h: propsgs-introspect.xml
- $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ --
+ $(dbusxx_xml2cpp) $^ --proxy=$@ --
BUILT_SOURCES = propsgs-glue-adaptor.h propsgs-glue-proxy.h
CLEANFILES = $(BUILT_SOURCES)
« no previous file with comments | « examples/glib/Makefile.am ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698