Don't install test/mock libraries unnecessarily

And clean up the build as a result.

diff --git a/egg/Makefile.am b/egg/Makefile.am
index 1dca3a3..4cefe10 100644 (file)
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -26,6 +26,10 @@ libegg_la_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBGCRYPT_CFLAGS)
 
+libegg_la_LIBADD = \
+       $(GLIB_LIBS) \
+       $(LIBGCRYPT_LIBS)
+
 libegg_la_SOURCES = \
        egg-armor.c egg-armor.h \
        egg-asn1x.c egg-asn1x.h \
@@ -69,7 +73,7 @@ libegg_hex_la_SOURCES = \
 libegg_hex_la_CFLAGS = \
        $(GLIB_CFLAGS)
 
-libegg_hex_la_LIBS = \
+libegg_hex_la_LIBADD = \
        $(GLIB_LIBS)
 
 libegg_secmem_la_SOURCES = \
@@ -81,7 +85,7 @@ libegg_test_la_SOURCES = \
 libegg_test_la_CFLAGS = \
        $(GLIB_CFLAGS)
 
-libegg_test_la_LIBS = \
+libegg_test_la_LIBADD = \
        $(GLIB_LIBS)
 
 # -------------------------------------------------------------------

diff --git a/gck/tests/Makefile.am b/gck/tests/Makefile.am
index 3ab0215..12cde2e 100644 (file)
--- a/gck/tests/Makefile.am
+++ b/gck/tests/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES = \
        $(GLIB_CFLAGS)
 
 LDADD =  \
-       libmock-test-module.la \
        $(top_builddir)/gck/libgck-testable.la \
        $(top_builddir)/egg/libegg-test.la \
        $(top_builddir)/egg/libegg-hex.la \
@@ -48,12 +47,12 @@ check-local: test
 
 check-memory: perform-memcheck
 
-all-local: $(check_PROGRAMS)
+all-local: $(check_PROGRAMS) $(check_LTLIBRARIES)
 
-lib_LTLIBRARIES = libmock-test-module.la
+check_LTLIBRARIES = libmock-test-module.la
 
 libmock_test_module_la_LDFLAGS = \
-       -avoid-version
+       -module -avoid-version -shared -rpath $(abs_builddir)
 
 libmock_test_module_la_CFLAGS = \
        -I$(top_srcdir)/gck \

diff --git a/ui/Makefile.am b/ui/Makefile.am
index d5b88ae..97ccf28 100644 (file)
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -52,7 +52,7 @@ libgcr_ui_@GCR_MAJOR@_la_LIBADD = \
 install-exec-hook:
        $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so
        $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_CURRENT@
-       $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_LT_RELEASE@
+       $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_CURRENT@.0.0
 
 uidir = $(datadir)/gcr-@GCR_MAJOR@/ui/