diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-11-03 23:25:08 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-11-03 23:25:08 +0100 |
| commit | 6fc13e2285a988b97764a8ea080961d80a603310 (patch) | |
| tree | 7e3445dd5426bedf6599f8a5c5cf43f962482cab | |
| parent | 10cbbd52fba11ce69cd69641c7b4a176e673d23e (diff) | |
| download | gnutls-6fc13e2285a988b97764a8ea080961d80a603310.tar.gz | |
Reverting "Drop guile libgnutls-extra stuff."
| -rw-r--r-- | guile/pre-inst-guile.in | 3 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 33 |
2 files changed, 32 insertions, 4 deletions
diff --git a/guile/pre-inst-guile.in b/guile/pre-inst-guile.in index 078597c6fc..b078b748ac 100644 --- a/guile/pre-inst-guile.in +++ b/guile/pre-inst-guile.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2007, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,4 +25,5 @@ export GUILE_LOAD_PATH exec @abs_top_builddir@/libtool --mode=execute \ -dlopen "@abs_top_builddir@/guile/src/libguile-gnutls-v-1.la" \ + -dlopen "@abs_top_builddir@/guile/src/libguile-gnutls-extra-v-1.la" \ @GUILE@ "$@" diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am index f26b3bcc37..21bf00e188 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -1,5 +1,5 @@ # GnuTLS --- Guile bindings for GnuTLS. -# Copyright (C) 2007-2011 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # # GnuTLS is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -27,11 +27,13 @@ EXTRA_DIST = \ BUILT_SOURCES = enum-map.i.c smob-types.i.c enums.h smobs.h \ priorities.i.c \ - core.x errors.x + extra-smobs.h extra-enums.h \ + extra-enum-map.i.c extra-smob-types.i.c \ + core.x errors.x extra.x CLEANFILES = $(BUILT_SOURCES) -lib_LTLIBRARIES = libguile-gnutls-v-1.la +lib_LTLIBRARIES = libguile-gnutls-v-1.la libguile-gnutls-extra-v-1.la # Linking against GnuTLS. GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la @@ -48,9 +50,18 @@ libguile_gnutls_v_1_la_LIBADD = \ $(GNUTLS_CORE_LIBS) $(GNULIB_LIBS) \ $(GUILE_LDFLAGS) +libguile_gnutls_extra_v_1_la_SOURCES = extra.c +libguile_gnutls_extra_v_1_la_CFLAGS = \ + $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) +libguile_gnutls_extra_v_1_la_LIBADD = \ + $(GNUTLS_CORE_LIBS) \ + $(builddir)/libguile-gnutls-v-1.la \ + $(GNULIB_LIBS) $(GUILE_LDFLAGS) + AM_CPPFLAGS = \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ + -I$(top_srcdir)/extra/includes \ -I$(top_builddir) \ -I$(builddir) @@ -87,6 +98,22 @@ smob-types.i.c: $(srcdir)/make-smob-types.scm priorities.i.c: $(srcdir)/make-session-priorities.scm $(GUILE_FOR_BUILD) $^ > $@ + +# GnuTLS-extra + +extra-enums.h: $(srcdir)/make-enum-header.scm + $(GUILE_FOR_BUILD) $^ extra > $@ + +extra-enum-map.i.c: $(srcdir)/make-enum-map.scm + $(GUILE_FOR_BUILD) $^ extra > $@ + +extra-smobs.h: $(srcdir)/make-smob-header.scm + $(GUILE_FOR_BUILD) $^ extra > $@ + +extra-smob-types.i.c: $(srcdir)/make-smob-types.scm + $(GUILE_FOR_BUILD) $^ extra > $@ + + # C file snarfing. # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be |