1
diff -ur curl/lib/Makefile.am curl-gnutls/lib/Makefile.am
2
--- curl/lib/Makefile.am 2005-09-28 16:48:25.000000000 +0200
3
+++ curl-gnutls/lib/Makefile.am 2005-09-28 16:49:37.000000000 +0200
8
-lib_LTLIBRARIES = libcurl.la
9
+lib_LTLIBRARIES = libcurl-gnutls.la
11
# we use srcdir/include for the static global include files
12
# we use builddir/lib for the generated lib/config.h file to get found
14
VERSIONED_SYMBOLS = -Wl,--version-script=libcurl.vers
17
-libcurl_la_LDFLAGS = $(UNDEF) $(VERSION) $(MIMPURE) $(VERSIONED_SYMBOLS)
18
+libcurl_gnutls_la_LDFLAGS = $(UNDEF) $(VERSION) $(MIMPURE) $(VERSIONED_SYMBOLS)
20
# Makefile.inc provides the CSOURCES and HHEADERS defines
23
-libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
24
+libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS)
26
WIN32SOURCES = $(CSOURCES)
27
WIN32HEADERS = $(HHEADERS) config-win32.h
28
diff -ur curl/src/Makefile.am curl-gnutls/src/Makefile.am
29
--- curl/src/Makefile.am 2005-09-28 16:48:25.000000000 +0200
30
+++ curl-gnutls/src/Makefile.am 2005-09-28 16:49:51.000000000 +0200
35
-curl_LDADD = ../lib/libcurl.la
36
-curl_DEPENDENCIES = ../lib/libcurl.la
37
+curl_LDADD = ../lib/libcurl-gnutls.la
38
+curl_DEPENDENCIES = ../lib/libcurl-gnutls.la
39
BUILT_SOURCES = hugehelp.c
40
CLEANFILES = hugehelp.c
41
NROFF=@NROFF@ @MANOPT@ # figured out by the configure script
42
--- curl/tests/libtest/Makefile.am 2006-06-14 14:34:08.000000000 +0200
43
+++ curl-gnutls/tests/libtest/Makefile.am 2006-06-14 15:00:14.000000000 +0200
45
lib518 lib519 lib520 lib521 lib523 lib524 lib525
47
lib500_SOURCES = lib500.c $(SUPPORTFILES)
48
-lib500_LDADD = $(LIBDIR)/libcurl.la
49
-lib500_DEPENDENCIES = $(LIBDIR)/libcurl.la
50
+lib500_LDADD = $(LIBDIR)/libcurl-gnutls.la
51
+lib500_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
53
lib501_SOURCES = lib501.c $(SUPPORTFILES)
54
-lib501_LDADD = $(LIBDIR)/libcurl.la
55
-lib501_DEPENDENCIES = $(LIBDIR)/libcurl.la
56
+lib501_LDADD = $(LIBDIR)/libcurl-gnutls.la
57
+lib501_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
59
lib502_SOURCES = lib502.c $(SUPPORTFILES)
60
-lib502_LDADD = $(LIBDIR)/libcurl.la
61
-lib502_DEPENDENCIES = $(LIBDIR)/libcurl.la
62
+lib502_LDADD = $(LIBDIR)/libcurl-gnutls.la
63
+lib502_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
65
lib503_SOURCES = lib503.c $(SUPPORTFILES)
66
-lib503_LDADD = $(LIBDIR)/libcurl.la
67
-lib503_DEPENDENCIES = $(LIBDIR)/libcurl.la
68
+lib503_LDADD = $(LIBDIR)/libcurl-gnutls.la
69
+lib503_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
71
lib504_SOURCES = lib504.c $(SUPPORTFILES)
72
-lib504_LDADD = $(LIBDIR)/libcurl.la
73
-lib504_DEPENDENCIES = $(LIBDIR)/libcurl.la
74
+lib504_LDADD = $(LIBDIR)/libcurl-gnutls.la
75
+lib504_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
77
lib505_SOURCES = lib505.c $(SUPPORTFILES)
78
-lib505_LDADD = $(LIBDIR)/libcurl.la
79
-lib505_DEPENDENCIES = $(LIBDIR)/libcurl.la
80
+lib505_LDADD = $(LIBDIR)/libcurl-gnutls.la
81
+lib505_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
83
lib506_SOURCES = lib506.c $(SUPPORTFILES)
84
-lib506_LDADD = $(LIBDIR)/libcurl.la
85
-lib506_DEPENDENCIES = $(LIBDIR)/libcurl.la
86
+lib506_LDADD = $(LIBDIR)/libcurl-gnutls.la
87
+lib506_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
89
lib507_SOURCES = lib507.c $(SUPPORTFILES)
90
-lib507_LDADD = $(LIBDIR)/libcurl.la
91
-lib507_DEPENDENCIES = $(LIBDIR)/libcurl.la
92
+lib507_LDADD = $(LIBDIR)/libcurl-gnutls.la
93
+lib507_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
95
lib508_SOURCES = lib508.c $(SUPPORTFILES)
96
-lib508_LDADD = $(LIBDIR)/libcurl.la
97
-lib508_DEPENDENCIES = $(LIBDIR)/libcurl.la
98
+lib508_LDADD = $(LIBDIR)/libcurl-gnutls.la
99
+lib508_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
101
lib509_SOURCES = lib509.c $(SUPPORTFILES)
102
-lib509_LDADD = $(LIBDIR)/libcurl.la
103
-lib509_DEPENDENCIES = $(LIBDIR)/libcurl.la
104
+lib509_LDADD = $(LIBDIR)/libcurl-gnutls.la
105
+lib509_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
107
lib510_SOURCES = lib510.c $(SUPPORTFILES)
108
-lib510_LDADD = $(LIBDIR)/libcurl.la
109
-lib510_DEPENDENCIES = $(LIBDIR)/libcurl.la
110
+lib510_LDADD = $(LIBDIR)/libcurl-gnutls.la
111
+lib510_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
113
lib511_SOURCES = lib511.c $(SUPPORTFILES)
114
-lib511_LDADD = $(LIBDIR)/libcurl.la
115
-lib511_DEPENDENCIES = $(LIBDIR)/libcurl.la
116
+lib511_LDADD = $(LIBDIR)/libcurl-gnutls.la
117
+lib511_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
119
lib512_SOURCES = lib512.c $(SUPPORTFILES)
120
-lib512_LDADD = $(LIBDIR)/libcurl.la
121
-lib512_DEPENDENCIES = $(LIBDIR)/libcurl.la
122
+lib512_LDADD = $(LIBDIR)/libcurl-gnutls.la
123
+lib512_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
125
lib513_SOURCES = lib513.c $(SUPPORTFILES)
126
-lib513_LDADD = $(LIBDIR)/libcurl.la
127
-lib513_DEPENDENCIES = $(LIBDIR)/libcurl.la
128
+lib513_LDADD = $(LIBDIR)/libcurl-gnutls.la
129
+lib513_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
131
lib514_SOURCES = lib514.c $(SUPPORTFILES)
132
-lib514_LDADD = $(LIBDIR)/libcurl.la
133
-lib514_DEPENDENCIES = $(LIBDIR)/libcurl.la
134
+lib514_LDADD = $(LIBDIR)/libcurl-gnutls.la
135
+lib514_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
137
lib515_SOURCES = lib515.c $(SUPPORTFILES)
138
-lib515_LDADD = $(LIBDIR)/libcurl.la
139
-lib515_DEPENDENCIES = $(LIBDIR)/libcurl.la
140
+lib515_LDADD = $(LIBDIR)/libcurl-gnutls.la
141
+lib515_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
143
lib516_SOURCES = lib516.c $(SUPPORTFILES)
144
-lib516_LDADD = $(LIBDIR)/libcurl.la
145
-lib516_DEPENDENCIES = $(LIBDIR)/libcurl.la
146
+lib516_LDADD = $(LIBDIR)/libcurl-gnutls.la
147
+lib516_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
149
lib517_SOURCES = lib517.c $(SUPPORTFILES)
150
-lib517_LDADD = $(LIBDIR)/libcurl.la
151
-lib517_DEPENDENCIES = $(LIBDIR)/libcurl.la
152
+lib517_LDADD = $(LIBDIR)/libcurl-gnutls.la
153
+lib517_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
155
lib518_SOURCES = lib518.c $(SUPPORTFILES)
156
-lib518_LDADD = $(LIBDIR)/libcurl.la
157
-lib518_DEPENDENCIES = $(LIBDIR)/libcurl.la
158
+lib518_LDADD = $(LIBDIR)/libcurl-gnutls.la
159
+lib518_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
161
lib519_SOURCES = lib519.c $(SUPPORTFILES)
162
-lib519_LDADD = $(LIBDIR)/libcurl.la
163
-lib519_DEPENDENCIES = $(LIBDIR)/libcurl.la
164
+lib519_LDADD = $(LIBDIR)/libcurl-gnutls.la
165
+lib519_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
167
lib520_SOURCES = lib520.c $(SUPPORTFILES)
168
-lib520_LDADD = $(LIBDIR)/libcurl.la
169
-lib520_DEPENDENCIES = $(LIBDIR)/libcurl.la
170
+lib520_LDADD = $(LIBDIR)/libcurl-gnutls.la
171
+lib520_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
173
lib521_SOURCES = lib521.c $(SUPPORTFILES)
174
-lib521_LDADD = $(LIBDIR)/libcurl.la
175
-lib521_DEPENDENCIES = $(LIBDIR)/libcurl.la
176
+lib521_LDADD = $(LIBDIR)/libcurl-gnutls.la
177
+lib521_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
179
lib523_SOURCES = lib523.c $(SUPPORTFILES)
180
-lib523_LDADD = $(LIBDIR)/libcurl.la
181
-lib523_DEPENDENCIES = $(LIBDIR)/libcurl.la
182
+lib523_LDADD = $(LIBDIR)/libcurl-gnutls.la
183
+lib523_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
185
lib524_SOURCES = lib524.c $(SUPPORTFILES)
186
-lib524_LDADD = $(LIBDIR)/libcurl.la
187
-lib524_DEPENDENCIES = $(LIBDIR)/libcurl.la
188
+lib524_LDADD = $(LIBDIR)/libcurl-gnutls.la
189
+lib524_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la
191
lib525_SOURCES = lib525.c $(SUPPORTFILES)
192
-lib525_LDADD = $(LIBDIR)/libcurl.la
193
-lib525_DEPENDENCIES = $(LIBDIR)/libcurl.la
194
+lib525_LDADD = $(LIBDIR)/libcurl-gnutls.la
195
+lib525_DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la