From 61a28d5ea2267c953fee9cbaf59fa1282390d153 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 3 Sep 2002 11:26:01 +0000 Subject: [PATCH] 2002-09-03 Marcus Brinkmann * Makefile.am (assuan_libobjs): Remove @LTLIBOBJS@ as we link them into gpgme unconditionally. (libgpgme_la_LIBADD): Change @LIBOBJS@ into @LTLIBOBJS@. --- trunk/gpgme/ChangeLog | 6 ++++++ trunk/gpgme/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 812ec6b..b6ffaaa 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2002-09-03 Marcus Brinkmann + + * Makefile.am (assuan_libobjs): Remove @LTLIBOBJS@ as we link them + into gpgme unconditionally. + (libgpgme_la_LIBADD): Change @LIBOBJS@ into @LTLIBOBJS@. + 2002-09-02 Marcus Brinkmann * Makefile.am (assuan_libobjs): Use @LTLIBOBJS@ instead @LIBOBJS@. diff --git a/trunk/gpgme/Makefile.am b/trunk/gpgme/Makefile.am index 11a5224..36cb9c1 100644 --- a/trunk/gpgme/Makefile.am +++ b/trunk/gpgme/Makefile.am @@ -32,7 +32,7 @@ libgpgme_la_LDFLAGS = -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ if BUILD_ASSUAN AM_CPPFLAGS = -I$(top_srcdir)/assuan -assuan_libobjs = ../assuan/libassuan.la @LTLIBOBJS@ +assuan_libobjs = ../assuan/libassuan.la else assuan_libobjs = endif @@ -66,7 +66,7 @@ libgpgme_la_SOURCES = \ engine-gpgsm.c engine-gpgsm.h \ sema.h io.h ${system_components} \ debug.c debug.h gpgme.c version.c errors.c -libgpgme_la_LIBADD = ${assuan_libobjs} @LIBOBJS@ +libgpgme_la_LIBADD = ${assuan_libobjs} @LTLIBOBJS@ errors.c : gpgme.h $(srcdir)/mkerrors < $(srcdir)/gpgme.h > errors.c -- 2.26.2