summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-10-30 19:24:53 +0100
committerSimon Josefsson <simon@josefsson.org>2008-10-30 19:24:53 +0100
commit47280398b7705d9b632f5866153e82c35c2840e1 (patch)
treeee1ec859ce51e2364c85a4e438c83cb4263d5e15
parent7417b7eba1fcad419d173461c5f7da54e42c142c (diff)
downloadgnutls-47280398b7705d9b632f5866153e82c35c2840e1.tar.gz
Builds on my system now.
-rw-r--r--guile/src/Makefile.am4
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/pkcs12-decode/Makefile.am4
3 files changed, 5 insertions, 5 deletions
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 9bcaf63264..0c6799c3fd 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -39,8 +39,8 @@ 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
+GNULIB_LIBS = $(top_builddir)/lib/gl/liblgnu.la
+GNULIB_CFLAGS = -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl
libguile_gnutls_v_1_la_SOURCES = core.c errors.c utils.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c864b3d86..8008d9fb7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/doc/examples
AM_LDFLAGS = -no-install
-LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lgl/liblgnu.la libutils.la
+LDADD = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
if ENABLE_MINITASN1
diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index 82202a1cf2..a1343184b7 100644
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -27,14 +27,14 @@ TESTS = pkcs12 pkcs12_s2k
check_PROGRAMS = pkcs12_s2k
-AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
+AM_CPPFLAGS = \
-I$(srcdir)/.. \
-I$(top_srcdir)/gl -I$(top_builddir)/gl \
-I$(top_srcdir)/includes -I$(top_builddir)/includes \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/doc/examples
AM_LDFLAGS = -no-install
-LDADD = ../../lib/libgnutls.la ../../gl/libgnu.la ../../lgl/liblgnu.la ../libutils.la
+LDADD = ../../lib/libgnutls.la ../../gl/libgnu.la ../libutils.la
if ENABLE_MINITASN1