diff options
| author | Andreas Volz <andreas@er00923n.fritz.box> | 2011-11-28 00:32:34 +0100 |
|---|---|---|
| committer | Andreas Volz <andreas@er00923n.fritz.box> | 2011-11-28 00:32:34 +0100 |
| commit | d1ec2544d52df89daa0415a755271a8c0e4b35e7 (patch) | |
| tree | 5c9eeb1eb0573787b0ba6b62a6592171d06c25b8 | |
| parent | 2a1e2dbe51ff477f6fa6499201ee819216199530 (diff) | |
| download | dbus-c++-d1ec2544d52df89daa0415a755271a8c0e4b35e7.tar.gz | |
sf.net bug: 3151031 xml2cpp needlessly includes and links dbus(-c++)
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/xml.cpp | 2 | ||||
| -rw-r--r-- | tools/xml2cpp.cpp | 2 | ||||
| -rw-r--r-- | tools/xml2cpp.h | 3 |
4 files changed, 1 insertions, 8 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index e89f048..c025cd1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp \ generate_adaptor.cpp generate_adaptor.h generate_proxy.cpp\ generate_proxy.h generator_utils.cpp generator_utils.h -dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) $(xml_LIBS) +dbusxx_xml2cpp_LDADD = $(xml_LIBS) dbusxx_introspect_SOURCES = introspect.h introspect.cpp dbusxx_introspect_LDADD = $(libdbus_cxx_la) diff --git a/tools/xml.cpp b/tools/xml.cpp index 68ae5a6..c363781 100644 --- a/tools/xml.cpp +++ b/tools/xml.cpp @@ -24,8 +24,6 @@ #include "xml.h" -#include <dbus-c++/debug.h> - #include <expat.h> std::istream &operator >> (std::istream &in, DBus::Xml::Document &doc) diff --git a/tools/xml2cpp.cpp b/tools/xml2cpp.cpp index 32481d8..7bfc3ea 100644 --- a/tools/xml2cpp.cpp +++ b/tools/xml2cpp.cpp @@ -21,8 +21,6 @@ * */ -#include <dbus/dbus.h> - #include <cstdlib> #include <cstring> #include <string> diff --git a/tools/xml2cpp.h b/tools/xml2cpp.h index 84f53fe..4b0cd12 100644 --- a/tools/xml2cpp.h +++ b/tools/xml2cpp.h @@ -29,9 +29,6 @@ #include "config.h" #endif -#include <dbus-c++/dbus.h> -#include <dbus/dbus.h> - #include "xml.h" #endif//__DBUSXX_TOOLS_XML2CPP_H |