From 918ad005b0a2770be84c2bb13727aa57f166cc81 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 10:36:34 -0400 Subject: [PATCH] Fix install failure in google backend. Instead of linking to libebook-google-utils.la, just add its source files directly to the libebookbackendgoogle module. So the code is duplicated in the backend module and the noinst unit test library. This was causing libtool to barf on bogus undefined reference errors during install. Still don't really understand what libtool's problem was -- maybe it didn't like the noinst library? Who knows. --- addressbook/backends/google/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am index d22f19e..0138234 100644 --- a/addressbook/backends/google/Makefile.am +++ b/addressbook/backends/google/Makefile.am @@ -28,10 +28,11 @@ libebookbackendgoogle_la_SOURCES = \ e-book-backend-google-factory.c \ e-book-backend-google.c \ e-book-backend-google.h \ + e-book-google-utils.c \ + e-book-google-utils.h \ $(GOA_SOURCES) libebookbackendgoogle_la_LIBADD = \ - libebook-google-utils.la \ $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ $(top_builddir)/addressbook/libebook/libebook-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ @@ -76,7 +77,6 @@ libebook_google_utils_la_CPPFLAGS = \ $(NULL) libebook_google_utils_la_LIBADD = \ - $(AM_LIBADD) \ $(top_builddir)/addressbook/libebook/libebook-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(top_builddir)/libebackend/libebackend-1.2.la \ -- 2.7.4