Remove dbus-auth-script from the shared library

Only the tests use this.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 6a6c402..a922fd8 100644 (file)
--- 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 3c44ae4..d3d1b95 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -139,8 +139,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                         \