diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-04-07 13:46:18 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-04-10 12:40:52 +0100 |
| commit | 3cd51e7b92f4a987a996250f0afcd5be4bb256f8 (patch) | |
| tree | f3ecea91b443a77403b85a7e8e0ab99fea62a487 /bus | |
| parent | 54c81ee9e87b1438dd2a95ff176335646d53e54f (diff) | |
| download | dbus-3cd51e7b92f4a987a996250f0afcd5be4bb256f8.tar.gz | |
build: Remove indirection from uses of Expat
We haven't supported XML libraries other than Expat since 2013.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69801
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index c1ccaf1b..6de6d0a8 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -69,8 +69,6 @@ agentdir=$(LAUNCHD_AGENT_DIR) agent_DATA=org.freedesktop.dbus-session.plist endif -XML_SOURCES=config-loader-expat.c - if DBUS_BUS_ENABLE_KQUEUE DIR_WATCH_SOURCE=dir-watch-kqueue.c else @@ -91,6 +89,7 @@ BUS_SOURCES= \ audit.h \ bus.c \ bus.h \ + config-loader-expat.c \ config-parser.c \ config-parser.h \ config-parser-common.c \ @@ -121,7 +120,7 @@ BUS_SOURCES= \ test.h \ utils.c \ utils.h \ - $(XML_SOURCES) + $(NULL) dbus_daemon_SOURCES= \ $(BUS_SOURCES) \ @@ -134,7 +133,7 @@ dbus_daemon_LDADD= \ $(DBUS_BUS_LIBS) LAUNCH_HELPER_SOURCES= \ - $(XML_SOURCES) \ + config-loader-expat.c \ config-parser-common.c \ config-parser-common.h \ config-parser-trivial.c \ @@ -217,7 +216,7 @@ endif DBUS_UNIX endif DBUS_ENABLE_EMBEDDED_TESTS test_bus_system_SOURCES= \ - $(XML_SOURCES) \ + config-loader-expat.c \ config-parser-common.c \ config-parser-common.h \ config-parser-trivial.c \ |