From 902b0e7d6b161ea64bbb860bf67f8454874e2eb6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 15 Jun 2011 11:16:54 +0100 Subject: [PATCH 2/2] Remove dbus-auth-script from the shared library Only the tests use this. --- cmake/dbus/CMakeLists.txt | 4 ++-- dbus/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index d1032e3..faa36a9 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -31,7 +31,6 @@ set (dbusinclude_HEADERS set (DBUS_LIB_SOURCES ${DBUS_DIR}/dbus-address.c ${DBUS_DIR}/dbus-auth.c - ${DBUS_DIR}/dbus-auth-script.c ${DBUS_DIR}/dbus-bus.c ${DBUS_DIR}/dbus-connection.c ${DBUS_DIR}/dbus-credentials.c @@ -74,7 +73,6 @@ endif(UNIX) set (DBUS_LIB_HEADERS ${DBUS_DIR}/dbus-auth.h - ${DBUS_DIR}/dbus-auth-script.h ${DBUS_DIR}/dbus-connection-internal.h ${DBUS_DIR}/dbus-credentials.h ${DBUS_DIR}/dbus-keyring.h @@ -149,6 +147,7 @@ set (DBUS_SHARED_HEADERS ### should be underscore-prefixed but don't really need ### to be unless they move to DBUS_SHARED_SOURCES later) set (DBUS_UTIL_SOURCES + ${DBUS_DIR}/dbus-auth-script.c ${DBUS_DIR}/dbus-auth-util.c ${DBUS_DIR}/dbus-credentials-util.c ${DBUS_DIR}/dbus-mainloop.c @@ -170,6 +169,7 @@ if (DBUS_BUILD_TESTS) endif (DBUS_BUILD_TESTS) set (DBUS_UTIL_HEADERS + ${DBUS_DIR}/dbus-auth-script.h ${DBUS_DIR}/dbus-mainloop.h ${DBUS_DIR}/dbus-message-factory.h ${DBUS_DIR}/dbus-shell.h diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 094773c..1f0c133 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -136,8 +136,6 @@ DBUS_LIB_SOURCES= \ dbus-address.c \ dbus-auth.c \ dbus-auth.h \ - dbus-auth-script.c \ - dbus-auth-script.h \ dbus-bus.c \ dbus-connection.c \ dbus-connection-internal.h \ @@ -226,6 +224,8 @@ DBUS_SHARED_SOURCES= \ ### should be underscore-prefixed but don't really need ### to be unless they move to DBUS_SHARED_SOURCES later) DBUS_UTIL_SOURCES= \ + dbus-auth-script.c \ + dbus-auth-script.h \ dbus-auth-util.c \ dbus-credentials-util.c \ dbus-mainloop.c \ -- 1.7.5.4