diff -Nru gnutls/docs/examples/Makefile.am gnutls-gil/docs/examples/Makefile.am --- gnutls/docs/examples/Makefile.am 2010-09-18 23:00:20.000000000 +0200 +++ gnutls-gil/docs/examples/Makefile.am 2010-10-17 15:23:48.000000000 +0200 @@ -29,7 +29,7 @@ CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS) # Dependencies -LDADD = $(LIBDIR)/libcurl.la +LDADD = $(LIBDIR)/libcurl-gnutls.la # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines include Makefile.inc diff -Nru gnutls/lib/Makefile.am gnutls-gil/lib/Makefile.am --- gnutls/lib/Makefile.am 2010-09-18 23:00:21.000000000 +0200 +++ gnutls-gil/lib/Makefile.am 2010-10-17 15:24:59.000000000 +0200 @@ -42,7 +42,7 @@ CLEANFILES = $(DSP) $(VCPROJ) -lib_LTLIBRARIES = libcurl.la +lib_LTLIBRARIES = libcurl-gnutls.la LIBCURL_LIBS = @LIBCURL_LIBS@ # This might hold -Werror @@ -116,12 +116,12 @@ MIMPURE = -mimpure-text endif -libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS) +libcurl_gnutls_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS) # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) WIN32SOURCES = $(CSOURCES) WIN32HEADERS = $(HHEADERS) config-win32.h diff -Nru gnutls/src/Makefile.am gnutls-gil/src/Makefile.am --- gnutls/src/Makefile.am 2010-09-18 23:00:22.000000000 +0200 +++ gnutls-gil/src/Makefile.am 2010-10-17 15:25:38.000000000 +0200 @@ -49,8 +49,8 @@ # This might hold -Werror CFLAGS += @CURL_CFLAG_EXTRAS@ -curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la +curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @CURL_LIBS@ +curl_DEPENDENCIES = $(top_builddir)/lib/libcurl-gnutls.la BUILT_SOURCES = hugehelp.c CLEANFILES = hugehelp.c # Use the C locale to ensure that only ASCII characters appear in the diff -Nru gnutls/tests/libtest/Makefile.am gnutls-gil/tests/libtest/Makefile.am --- gnutls/tests/libtest/Makefile.am 2010-09-18 23:00:22.000000000 +0200 +++ gnutls-gil/tests/libtest/Makefile.am 2010-10-17 15:26:35.000000000 +0200 @@ -54,8 +54,8 @@ test1022.pl Makefile.inc # Dependencies (may need to be overriden) -LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -DEPENDENCIES = $(top_builddir)/lib/libcurl.la +LDADD = $(top_builddir)/lib/libcurl-gnutls.la @CURL_LIBS@ +DEPENDENCIES = $(top_builddir)/lib/libcurl-gnutls.la # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS)