From f554db982fdb19342d73eb461efc6af39d44338f Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Tue, 2 Feb 2010 13:52:58 -0800 Subject: [PATCH] dbus-spawn.h is internal, it shouldn't be installed --- cmake/dbus/CMakeLists.txt | 1 - dbus/Makefile.am | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index b798a41..d1cb298 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -23,7 +23,6 @@ set (dbusinclude_HEADERS ${DBUS_DIR}/dbus-server.h ${DBUS_DIR}/dbus-shared.h ${DBUS_DIR}/dbus-signature.h - ${DBUS_DIR}/dbus-spawn.h ${DBUS_DIR}/dbus-threads.h ${DBUS_DIR}/dbus-types.h dbus-arch-deps.h diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 1c710ac..886d58f 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -23,6 +23,10 @@ SUFFIXES = rc dbus_res = versioninfo.o dbus_res_ldflag = -Wl,$(dbus_res) no_undefined = -no-undefined + + +### FIXME use the .def.in files depending on the current config +### or combine them in a single .def file as done in the cmake build export_symbols = -export-symbols $(srcdir)/dbus-1.def install-def-file: @@ -107,7 +111,6 @@ dbusinclude_HEADERS= \ dbus-server.h \ dbus-shared.h \ dbus-signature.h \ - dbus-spawn.h \ dbus-threads.h \ dbus-types.h -- 2.7.4