[seahorse] Makefile.am: Fix up linker errors between libseahorse.a



commit e53edfea7230861c4d706f33f92e980e8e84e5cf
Author: Stef Walter <stefw gnome org>
Date:   Tue Mar 4 15:49:08 2014 +0100

    Makefile.am: Fix up linker errors between libseahorse.a
    
    For now libcommon.a and libseahorse.a have circular dependencies
    on each other. We should merge them one day.

 src/Makefile.am |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d169d..170c2a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,13 +26,17 @@ seahorse_SOURCES = \
        src/seahorse-main.c \
        src/seahorse-sidebar.c src/seahorse-sidebar.h
 
+# HACK: One day libcommon.a and libseahorse.a will be one and
+# the same. Until then specify libseahorse.a twice when linking
+
 seahorse_LDADD = \
        $(PGP_LDADD) \
        $(SSH_LDADD) \
        $(PKCS11_LDADD) \
-       libseahorse.a \
        libseahorse-gkr.a \
+       libseahorse.a \
        libcommon.a \
+       libseahorse.a \
        libeggdatetime.a \
        libeggtreemultidnd.a \
        $(SEAHORSE_LIBS)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]