diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-10-28 15:45:14 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-10-28 15:45:14 +0200 |
| commit | addfb5b109df8640eb5cc63bdc51e70fc2d499d8 (patch) | |
| tree | c505fe428501a6646e6caa85fbb8b4e5a60c2928 /guile | |
| parent | b5428d9518bc582190c78a9b1da9460a73cb5e18 (diff) | |
| download | gnutls-addfb5b109df8640eb5cc63bdc51e70fc2d499d8.tar.gz | |
Drop guile libgnutls-extra stuff.
Diffstat (limited to 'guile')
| -rw-r--r-- | guile/pre-inst-guile.in | 3 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 33 |
2 files changed, 4 insertions, 32 deletions
diff --git a/guile/pre-inst-guile.in b/guile/pre-inst-guile.in index b078b748ac..078597c6fc 100644 --- a/guile/pre-inst-guile.in +++ b/guile/pre-inst-guile.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2007, 2010 Free Software Foundation, Inc. +# Copyright (C) 2007, 2010, 2011 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,5 +25,4 @@ 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 21bf00e188..f26b3bcc37 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -1,5 +1,5 @@ # GnuTLS --- Guile bindings for GnuTLS. -# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2007-2011 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,13 +27,11 @@ EXTRA_DIST = \ BUILT_SOURCES = enum-map.i.c smob-types.i.c enums.h smobs.h \ priorities.i.c \ - extra-smobs.h extra-enums.h \ - extra-enum-map.i.c extra-smob-types.i.c \ - core.x errors.x extra.x + core.x errors.x CLEANFILES = $(BUILT_SOURCES) -lib_LTLIBRARIES = libguile-gnutls-v-1.la libguile-gnutls-extra-v-1.la +lib_LTLIBRARIES = libguile-gnutls-v-1.la # Linking against GnuTLS. GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la @@ -50,18 +48,9 @@ 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) @@ -98,22 +87,6 @@ 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 |