diff options
| author | Ludovic Courtes <ludo@chbouib.org> | 2007-06-08 19:48:27 +0200 |
|---|---|---|
| committer | Ludovic Courtes <ludo@chbouib.org> | 2007-06-08 19:48:27 +0200 |
| commit | 904f39df90c17a2d34fcef0078acfa2b22b89558 (patch) | |
| tree | b3105b0968d0255ba0e3685c6632d6efb3aadc39 /guile | |
| parent | 4a4deb771fd18fcde99ea166286e619528eeebc7 (diff) | |
| download | gnutls-904f39df90c17a2d34fcef0078acfa2b22b89558.tar.gz | |
Fix Guile linking so that the right GnuTLS libs are used.
* guile/src/Makefile.am (GNUTLS_CORE_LIBS, GNUTLS_EXTRA_LIBS): New.
(GNULIB_LDFLAGS): Renamed to `GNULIB_LIBS'. Explicitly pass the `.la'
path.
(libguile_gnutls_v_0_la_LDFLAGS): Pass `$(GUILE_LDFLAGS)' as the last
item so that RPATH is in the right order (i.e., all
`$(top_builddir)/...' appear first).
(libguile_gnutls_extra_v_0_la_LDFLAGS): Likewise.
Diffstat (limited to 'guile')
| -rw-r--r-- | guile/src/Makefile.am | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am index c86e3f8cd8..0c710e816b 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -34,25 +34,29 @@ CLEANFILES = $(BUILT_SOURCES) lib_LTLIBRARIES = libguile-gnutls-v-0.la libguile-gnutls-extra-v-0.la -GNULIB_LDFLAGS = -L$(top_builddir)/lgl -llgnu +# Linking against GnuTLS. +GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la +GNUTLS_EXTRA_LIBS = $(top_builddir)/libextra/libgnutls-extra.la + +# Linking against Gnulib modules. +GNULIB_LIBS = $(top_builddir)/lgl/liblgnu.la GNULIB_CFLAGS = -I$(top_builddir)/lgl -I$(top_srcdir)/lgl + libguile_gnutls_v_0_la_SOURCES = core.c errors.c utils.c -libguile_gnutls_v_0_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(LIBGNUTLS_CFLAGS) +libguile_gnutls_v_0_la_CFLAGS = \ + $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) libguile_gnutls_v_0_la_LDFLAGS = \ - $(GNULIB_LDFLAGS) $(GUILE_LDFLAGS) $(LIBGNUTLS_LIBS) + $(GNULIB_LIBS) $(GNUTLS_CORE_LIBS) $(GUILE_LDFLAGS) libguile_gnutls_extra_v_0_la_SOURCES = extra.c libguile_gnutls_extra_v_0_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(GNULIB_CFLAGS) $(GUILE_CFLAGS) \ - $(LIBGNUTLS_CFLAGS) $(LIBGNUTLS_EXTRA_CFLAGS) + $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) libguile_gnutls_extra_v_0_la_LDFLAGS = \ - $(GNULIB_LDFLAGS) $(GUILE_LDFLAGS) \ - $(LIBGNUTLS_LIBS) $(LIBGNUTLS_EXTRA_LIBS) \ - -L$(builddir) -lguile-gnutls-v-0 + $(GNULIB_LIBS) \ + $(builddir)/libguile-gnutls-v-0.la \ + $(GNUTLS_CORE_LIBS) $(GNUTLS_EXTRA_LIBS) \ + $(GUILE_LDFLAGS) AM_CPPFLAGS = -I$(top_builddir) -I$(builddir) |