PolicyKit: Branch 'master'

[David Zeuthen]

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

New commits:
commit 8cd339bbb8c9c63a56251261a7b4cdae199b6f72
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Apr 30 13:21:04 2008 -0400

    fix autotools screwup
    
    I hate autotools.

diff --git a/src/polkit-dbus/Makefile.am b/src/polkit-dbus/Makefile.am
index a62c4c9..0b9762a 100644
--- a/src/polkit-dbus/Makefile.am
+++ b/src/polkit-dbus/Makefile.am
@@ -27,10 +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@
-
-if !POLKIT_BUILD_TESTS
-libpolkit_dbus_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '^polkit_.*'
+if POLKIT_BUILD_TESTS
+libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
+else
+libpolkit_dbus_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
+                            -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 fa83207..18f9b6e 100644
--- a/src/polkit-grant/Makefile.am
+++ b/src/polkit-grant/Makefile.am
@@ -34,10 +34,12 @@ 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@
 
-if !POLKIT_BUILD_TESTS
-libpolkit_grant_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_polkit_authorization_db_auth_file_add)'
+if POLKIT_BUILD_TESTS
+libpolkit_grant_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@
+else
+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)'
 endif
 
 
diff --git a/src/polkit/Makefile.am b/src/polkit/Makefile.am
index dbc66e7..03c2ce7 100644
--- a/src/polkit/Makefile.am
+++ b/src/polkit/Makefile.am
@@ -73,10 +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@
-
-if !POLKIT_BUILD_TESTS
-libpolkit_la_LDFLAGS += -export-dynamic -no-undefined -export-symbols-regex '(^polkit_.*|_pk_validate_unique_bus_name)'
+if POLKIT_BUILD_TESTS
+libpolkit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @R_DYNAMIC_LDFLAG@ \
+else
+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)'
 endif
 
 ## note that TESTS has special meaning (stuff to use in make check)