From 1346caf9523dd143ed47e11b52f26d8a8d574033 Mon Sep 17 00:00:00 2001 From: pdurante Date: Mon, 27 Aug 2007 21:36:12 +0000 Subject: [PATCH] * Altough the library doesn't directly link to expat anymore, some files weren't updated to reflect this, fixed (Alexey Morozov) git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@12396 30a43799-04e7-0310-8b2b-ea0d24f86d0e --- examples/glib/Makefile.am | 4 ++-- examples/glib/dbus-browser.cpp | 1 + tools/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/glib/Makefile.am b/examples/glib/Makefile.am index a327c00..849c468 100644 --- a/examples/glib/Makefile.am +++ b/examples/glib/Makefile.am @@ -1,12 +1,12 @@ EXTRA_DIST = -AM_CPPFLAGS = -I$(top_srcdir)/include $(gtkmm_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include $(gtkmm_CFLAGS) -I$(top_srcdir)/tools if HAVE_GTKMM noinst_PROGRAMS = dbus-browser endif -dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp +dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS) dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml diff --git a/examples/glib/dbus-browser.cpp b/examples/glib/dbus-browser.cpp index 04f9bad..cd74d70 100644 --- a/examples/glib/dbus-browser.cpp +++ b/examples/glib/dbus-browser.cpp @@ -1,5 +1,6 @@ #include "dbus-browser.h" +#include #include using namespace std; diff --git a/tools/Makefile.am b/tools/Makefile.am index c1904cb..d6044a1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -16,7 +16,7 @@ endif bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp -dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) +dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) $(xml_LIBS) dbusxx_introspect_SOURCES = introspect.h introspect.cpp dbusxx_introspect_LDADD = $(libdbus_cxx_la)