PolicyKit: Branch 'master'

[David Zeuthen]

 src/polkit-dbus/Makefile.am  |    7 +++++--
 src/polkit-grant/Makefile.am |    7 +++++--
 src/polkit/Makefile.am       |    9 ++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit d626acf5157bac89d2fee0e15d5449eddc26f307
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Apr 30 13:11:25 2008 -0400

    fix some build stuff to so the test suites run

diff --git a/src/polkit-dbus/Makefile.am b/src/polkit-dbus/Makefile.am
index 6c5863f..a62c4c9 100644
--- a/src/polkit-dbus/Makefile.am
+++ b/src/polkit-dbus/Makefile.am
@@ -27,8 +27,11 @@ libpolkit_dbus_la_SOURCES =                                	\
 
 libpolkit_dbus_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/src/kit/libkit.la $(top_builddir)/src/polkit/libpolkit.la $(SELINUX_LIBS)
 
-libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
-		            -export-dynamic -no-undefined -export-symbols-regex '^polkit_.*'
+libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@
+
+if !POLKIT_BUILD_TESTS
+libpolkit_dbus_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '^polkit_.*'
+endif
 
 libexec_PROGRAMS = polkit-resolve-exe-helper
 
diff --git a/src/polkit-grant/Makefile.am b/src/polkit-grant/Makefile.am
index f947911..fa83207 100644
--- a/src/polkit-grant/Makefile.am
+++ b/src/polkit-grant/Makefile.am
@@ -34,8 +34,11 @@ endif
 
 libpolkit_grant_la_LIBADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/kit/libkit.la $(top_builddir)/src/polkit/libpolkit.la
 
-libpolkit_grant_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
-		             -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_polkit_authorization_db_auth_file_add)'
+libpolkit_grant_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@
+
+if !POLKIT_BUILD_TESTS
+libpolkit_grant_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_polkit_authorization_db_auth_file_add)'
+endif
 
 
 # Only if the authdb backend has the capability POLKIT_AUTHORIZATION_DB_CAPABILITY_CAN_OBTAIN
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index da9a97e..dbc66e7 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -73,8 +73,11 @@ endif
 
 libpolkit_la_LIBADD = @EXPAT_LIBS@ $(top_builddir)/src/kit/libkit.la
 
-libpolkit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
-	               -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_pk_validate_unique_bus_name)'
+libpolkit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@
+
+if !POLKIT_BUILD_TESTS
+libpolkit_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_pk_validate_unique_bus_name)'
+endif
 
 ## note that TESTS has special meaning (stuff to use in make check)
 ## so if adding tests not to be run in make check, don't add them to 
@@ -88,7 +91,7 @@ check_PROGRAMS=$(TESTS)
 polkit_test_SOURCES=				\
 	polkit-test.h		polkit-test.c
 
-polkit_test_LDADD=$(top_builddir)/src/polkit/libpolkit.la
+polkit_test_LDADD=$(top_builddir)/src/kit/libkit.la $(top_builddir)/src/polkit/libpolkit.la
 polkit_test_LDFLAGS=
 
 if POLKIT_GCOV_ENABLED