aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2002-09-03 11:26:01 +0000
committerMarcus Brinkmann <[email protected]>2002-09-03 11:26:01 +0000
commit20707b1928ec38e55790473a6f9b2b3f23fb7615 (patch)
tree16003230611a4deb75ef0c271f8343f5306b0ccb
parent2002-09-02 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-20707b1928ec38e55790473a6f9b2b3f23fb7615.tar.gz
gpgme-20707b1928ec38e55790473a6f9b2b3f23fb7615.zip
2002-09-03 Marcus Brinkmann <[email protected]>
* Makefile.am (assuan_libobjs): Remove @LTLIBOBJS@ as we link them into gpgme unconditionally. (libgpgme_la_LIBADD): Change @LIBOBJS@ into @LTLIBOBJS@.
-rw-r--r--gpgme/ChangeLog6
-rw-r--r--gpgme/Makefile.am4
2 files changed, 8 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 812ec6b0..b6ffaaa3 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03 Marcus Brinkmann <[email protected]>
+
+ * 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 <[email protected]>
* Makefile.am (assuan_libobjs): Use @LTLIBOBJS@ instead @LIBOBJS@.
diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index 11a52249..36cb9c19 100644
--- a/gpgme/Makefile.am
+++ b/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