1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
--- build.conf.orig Fri Mar 8 17:19:05 2002
+++ build.conf Fri Mar 8 18:42:28 2002
@@ -63,7 +63,7 @@
type = exe
path = subversion/clients/cmdline
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
- $(SVN_APR_LIBS) libexpat
+ $(SVN_APR_LIBS) -lexpat
manpages = subversion/clients/cmdline/man/svn.1
infopages = doc/user/manual/svn-manual.info
doc/user/svn_for_cvs_users/svn_for_cvs_users.info
@@ -77,14 +77,14 @@
type = exe
path = subversion/svnadmin
install = fs-bin
-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# The subversion repository inspection tool
[svnlook]
type = exe
path = subversion/svnlook
install = fs-bin
-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# Library needed by all subversion clients
[libsvn_client]
@@ -141,7 +141,7 @@
type = lib
install = base-lib
path = subversion/libsvn_subr
-libs = $(SVN_APR_LIBS) libexpat
+libs = $(SVN_APR_LIBS) -lexpat
# Working copy management lib
[libsvn_wc]
@@ -161,12 +161,12 @@
install = apache-mod
# Simple XML-parsing lib
-[libexpat]
-type = lib
-install = base-lib
-path = expat-lite
+#[libexpat]
+#type = lib
+#install = base-lib
+#path = expat-lite
# there are some .c files included by others, so *.c isn't appropriate
-sources = hashtable.c xmlparse.c xmlrole.c xmltok.c
+#sources = hashtable.c xmlparse.c xmlrole.c xmltok.c
# ----------------------------------------------------------------------------
#
@@ -210,7 +210,7 @@
sources = fs-test.c
install = fs-test
libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
- $(SVN_APR_LIBS) libexpat
+ $(SVN_APR_LIBS) -lexpat
# run-fs-tests.sh will run this for us
testing = skip
@@ -220,7 +220,7 @@
path = subversion/tests/libsvn_fs
sources = skel-test.c
install = fs-test
-libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# run-fs-tests.sh will run this for us
testing = skip
@@ -230,7 +230,7 @@
path = subversion/tests/libsvn_fs
sources = key-test.c
install = fs-test
-libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# run-fs-tests.sh will run this for us
testing = skip
@@ -241,7 +241,7 @@
sources = strings-reps-test.c
install = fs-test
libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
- $(SVN_APR_LIBS) libexpat
+ $(SVN_APR_LIBS) -lexpat
# run-fs-tests.sh will run this for us
testing = skip
@@ -251,7 +251,7 @@
path = subversion/tests/libsvn_repos
sources = md5args.c
install = test
-libs = libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
# run-repos-tests.sh will run this for us
testing = skip
@@ -262,7 +262,7 @@
sources = repos-test.c dir-delta-editor.c
install = fs-test
libs = libsvn_test libsvn_test_fs libsvn_repos libsvn_fs libsvn_delta
- libsvn_subr $(SVN_APR_LIBS) libexpat
+ libsvn_subr $(SVN_APR_LIBS) -lexpat
# run-repos-tests.sh will run this for us
testing = skip
@@ -272,7 +272,7 @@
path = subversion/tests/libsvn_subr
sources = hashdump-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# test svn_stringbuf_t utilities
[stringtest]
@@ -280,7 +280,7 @@
path = subversion/tests/libsvn_subr
sources = stringtest.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# test path library
[path-test]
@@ -296,7 +296,7 @@
path = subversion/tests/libsvn_wc
sources = translate-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) -lexpat
# use random data to test delta processing
[random-test]
@@ -304,7 +304,7 @@
path = subversion/tests/libsvn_delta
sources = random-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
### Tests that are simply broken (fix?) ----------
@@ -315,7 +315,7 @@
path = subversion/tests/libsvn_delta
sources = delta-combine-test.c
install = test
-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# disabled for now -- the delta combiner isn't written, and we
# don't really have any idea if the interface would be compatible
# with this test, anyway.
@@ -328,7 +328,7 @@
sources = ra-local-test.c
install = fs-test
libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr
- $(SVN_APR_LIBS) libexpat
+ $(SVN_APR_LIBS) -lexpat
# disabled for now, BROKEN.
testing = skip
@@ -341,7 +341,7 @@
path = subversion/tests/libsvn_subr
sources = target-test.c
install = test
-libs = libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
# target-test.sh will run this for us
testing = skip
@@ -351,7 +351,7 @@
path = subversion/tests/libsvn_delta
sources = xml-output-test.c
install = test
-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# this is really redundant with our XML svn-test*.sh tests.
testing = skip
@@ -361,7 +361,7 @@
path = subversion/tests/libsvn_wc
sources = checkout-test.c
install = test
-libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# this is really redundant with our XML svn-test*.sh tests.
testing = skip
@@ -371,7 +371,7 @@
path = subversion/tests/libsvn_wc
sources = commit-test.c
install = test
-libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
# this is really redundant with our XML svn-test*.sh tests.
testing = skip
@@ -384,7 +384,7 @@
path = subversion/tests/libsvn_delta
sources = deltaparse-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
testing = skip
@@ -397,7 +397,7 @@
path = subversion/tests/libsvn_delta
sources = svndiff-test.c
install = test
-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
testing = skip
# compare two files, print txdelta windows
@@ -406,7 +406,7 @@
path = subversion/tests/libsvn_delta
sources = vdelta-test.c
install = test
-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
testing = skip
|
