2002-09-03 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (assuan_libobjs): Remove @LTLIBOBJS@ as we link them
	into gpgme unconditionally.
	(libgpgme_la_LIBADD): Change @LIBOBJS@ into @LTLIBOBJS@.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 812ec6b08bf1ce15b66761d29391509b92375c88..b6ffaaa333e1190277cd664899e3323a27faef07 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * Makefile.am (assuan_libobjs): Use @LTLIBOBJS@ instead @LIBOBJS@.

diff --git a/trunk/gpgme/Makefile.am b/trunk/gpgme/Makefile.am
index 11a522491f3529be4cdaadcf2072df31e65f8432..36cb9c19b1b9aeb80074415bfb020bad7c36e3cf 100644 (file)
--- 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