Make private symbols accessible to libpolkitagent and libpolkitbackend

libpolkit{agent,backend} use private symbols from libpolkit-gobject.
As we no longer export them, the build fails.
Move those symbols into a separate noinst lib libpolkit-private, which
those three libs can link against.

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index 2de31d6734db507fd5ac81f1926587fe651431f7..f4d8a238d241a12347363fad851471107a5a7468 100644 (file)
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -48,6 +48,21 @@ polkit-built-sources.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.Poli
 #
 polkit_built_sources = _polkitactiondescription.c _polkitactiondescription.h _polkitauthenticationagent.c _polkitauthenticationagent.h _polkitauthority.c _polkitauthority.h _polkitauthorizationresult.c _polkitauthorizationresult.h _polkitbindings.c _polkitbindings.h _polkitbindingsmarshal.c _polkitbindingsmarshal.h _polkitbindingstypes.h _polkitcheckauthorizationflags.c _polkitcheckauthorizationflags.h _polkiterror.c _polkiterror.h _polkitidentity.c _polkitidentity.h _polkitimplicitauthorization.c _polkitimplicitauthorization.h _polkitsubject.c _polkitsubject.h _polkittemporaryauthorization.c _polkittemporaryauthorization.h docbook-interface-org.freedesktop.PolicyKit1.AuthenticationAgent.xml docbook-interface-org.freedesktop.PolicyKit1.Authority.xml _polkitbindingsmarshal.list
 
+noinst_LTLIBRARIES = libpolkit-private.la
+
+libpolkit_private_la_SOURCES = $(polkit_built_sources)
+
+libpolkit_private_la_CFLAGS =                                          \
+       -D_POLKIT_COMPILATION                                           \
+       $(GLIB_CFLAGS)                                                  \
+       $(EGG_DBUS_CFLAGS)                                              \
+       $(NULL)
+
+libpolkit_private_la_LIBADD =                                          \
+       $(GLIB_LIBS)                                                    \
+       $(EGG_DBUS_LIBS)                                                \
+       $(NULL)
+
 lib_LTLIBRARIES=libpolkit-gobject-1.la
 
 libpolkit_gobject_1includedir=$(includedir)/polkit-1/polkit
@@ -76,7 +91,6 @@ libpolkit_gobject_1include_HEADERS =                                                  \
 
 libpolkit_gobject_1_la_SOURCES =                                                       \
        $(BUILT_SOURCES)                                                                \
-       $(polkit_built_sources)                                                         \
         polkit.h                                                                       \
        polkitactiondescription.c               polkitactiondescription.h               \
        polkitdetails.c                         polkitdetails.h                         \
@@ -104,6 +118,7 @@ libpolkit_gobject_1_la_CFLAGS =                                             \
 libpolkit_gobject_1_la_LIBADD =                                        \
         $(GLIB_LIBS)                                                   \
         $(EGG_DBUS_LIBS)                                               \
+       libpolkit-private.la                                            \
         $(NULL)
 
 libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'

diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
index 1903e0afde584957eebe8dccd0c0f7d517648cde..3f3832907f825760376a8b2ccf1d6a0b3c0984dd 100644 (file)
--- a/src/polkitagent/Makefile.am
+++ b/src/polkitagent/Makefile.am
@@ -59,6 +59,7 @@ libpolkit_agent_1_la_LIBADD =                                         \
         $(GLIB_LIBS)                                                   \
         $(EGG_DBUS_LIBS)                                               \
        $(top_builddir)/src/polkit/libpolkit-gobject-1.la               \
+       $(top_builddir)/src/polkit/libpolkit-private.la                 \
        $(EXPAT_LIBS)                                                   \
         $(NULL)
 

diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
index c1ae1e56d38bf0475181bf09c16fba0b0c97016f..48695d2f5d4e065893b2c68015944fc905d8cad4 100644 (file)
--- a/src/polkitbackend/Makefile.am
+++ b/src/polkitbackend/Makefile.am
@@ -77,6 +77,7 @@ libpolkit_backend_1_la_LIBADD =                                               \
         $(GLIB_LIBS)                                                   \
         $(EGG_DBUS_LIBS)                                               \
        $(top_builddir)/src/polkit/libpolkit-gobject-1.la               \
+       $(top_builddir)/src/polkit/libpolkit-private.la                 \
        $(EXPAT_LIBS)                                                   \
         $(NULL)