* Renamed pkg-config configuration file

* Initial support for out-of-tree builds and crosscompilation (Robert Schwebel)


git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@9043 30a43799-04e7-0310-8b2b-ea0d24f86d0e

tools/Makefile.am

@@ -1,15 +1,25 @@
+# hacky, but ...
+
+CXX = $(CXX_FOR_BUILD)
+
 AM_CPPFLAGS = \
 	$(dbus_CFLAGS) \
 	-I$(top_srcdir)/include \
 	-DDBUS_API_SUBJECT_TO_CHANGE
 
+if CROSS_COMPILING
+libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la
+else
+libdbus_cxx_la = $(top_builddir)/src/libdbus-c++-1.la
+endif
+
 bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
 
 dbusxx_xml2cpp_SOURCES = xml2cpp.h xml2cpp.cpp
-dbusxx_xml2cpp_LDADD = $(dbus_LIBS) $(top_builddir)/src/libdbus-c++-1.la
+dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la)
 
 dbusxx_introspect_SOURCES = introspect.h introspect.cpp
-dbusxx_introspect_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+dbusxx_introspect_LDADD = $(libdbus_cxx_la)
 
 MAINTAINERCLEANFILES = \
 	Makefile.in