summaryrefslogtreecommitdiff
path: root/libextra
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-02-13 07:58:29 +0000
committerSimon Josefsson <simon@josefsson.org>2007-02-13 07:58:29 +0000
commitf3e0e7272869e13fb7243ba4dbc279e0fe2ab2ce (patch)
tree3674450ce492c4d8e9dd029b8c3b98639d3766d2 /libextra
parent064611eb25572db20d88d3653a6e43ef272a2e78 (diff)
downloadgnutls-f3e0e7272869e13fb7243ba4dbc279e0fe2ab2ce.tar.gz
No need for gl/.
Diffstat (limited to 'libextra')
-rw-r--r--libextra/Makefile.am4
-rw-r--r--libextra/opencdk/Makefile.am5
2 files changed, 4 insertions, 5 deletions
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 8e6801e880..e51370d243 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -72,7 +72,7 @@ lib_LTLIBRARIES += libgnutls-openssl.la
libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \
openssl_compat.c
-libgnutls_openssl_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la
+libgnutls_openssl_la_LIBADD = ../lib/libgnutls.la
libgnutls_openssl_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -123,7 +123,7 @@ libgnutls_extra_la_LDFLAGS += \
libgnutls_extra_la_SOURCES += gnutls_extra.h libgnutls-extra.vers
-libgnutls_extra_la_LIBADD += ../gl/libgnu.la ../lib/libgnutls.la
+libgnutls_extra_la_LIBADD += ../lib/libgnutls.la
if HAVE_LD_VERSION_SCRIPT
libgnutls_extra_la_LDFLAGS += \
diff --git a/libextra/opencdk/Makefile.am b/libextra/opencdk/Makefile.am
index 6218f1c0cc..880926b506 100644
--- a/libextra/opencdk/Makefile.am
+++ b/libextra/opencdk/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
#
# Author: Nikos Mavroyanopoulos
#
@@ -21,8 +21,7 @@
# 02110-1301, USA.
INCLUDES = -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
- -I$(top_srcdir)/gl -I$(top_builddir)/gl
+ -I$(top_srcdir)/lgl -I$(top_builddir)/lgl
noinst_LTLIBRARIES = libminiopencdk.la