Contents of /trunk/kvirc/patches/kvirc-3.2.0-linking-fix.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 68712 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 68712 byte(s)
-import
1 | diff -Nru kvirc-3.2.0.orig/src/kvirc/build/Makefile.am kvirc-3.2.0/src/kvirc/build/Makefile.am |
2 | --- kvirc-3.2.0.orig/src/kvirc/build/Makefile.am 2005-01-25 03:05:13.000000000 +0100 |
3 | +++ kvirc-3.2.0/src/kvirc/build/Makefile.am 2005-03-07 16:50:19.000000000 +0100 |
4 | @@ -9,7 +9,7 @@ |
5 | $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" |
6 | |
7 | kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) |
8 | -kvirc_LDADD = $(SS_LIBLINK) -lkvilib |
9 | +kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
10 | |
11 | bin_PROGRAMS = kvirc |
12 | |
13 | diff -Nru kvirc-3.2.0.orig/src/kvirc/build/Makefile.in kvirc-3.2.0/src/kvirc/build/Makefile.in |
14 | --- kvirc-3.2.0.orig/src/kvirc/build/Makefile.in 2005-02-26 04:35:03.000000000 +0100 |
15 | +++ kvirc-3.2.0/src/kvirc/build/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
16 | @@ -189,7 +189,7 @@ |
17 | |
18 | |
19 | kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) |
20 | -kvirc_LDADD = $(SS_LIBLINK) -lkvilib |
21 | +kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
22 | |
23 | bin_PROGRAMS = kvirc |
24 | |
25 | diff -Nru kvirc-3.2.0.orig/src/modules/about/Makefile.am kvirc-3.2.0/src/modules/about/Makefile.am |
26 | --- kvirc-3.2.0.orig/src/modules/about/Makefile.am 2004-12-06 03:50:38.000000000 +0100 |
27 | +++ kvirc-3.2.0/src/modules/about/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
28 | @@ -11,7 +11,7 @@ |
29 | |
30 | libkviabout_la_SOURCES = libkviabout.cpp aboutdialog.cpp |
31 | |
32 | -libkviabout_la_LIBADD = $(SS_LIBLINK) -lkvilib |
33 | +libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
34 | |
35 | noinst_HEADERS= aboutdialog.h |
36 | |
37 | diff -Nru kvirc-3.2.0.orig/src/modules/about/Makefile.in kvirc-3.2.0/src/modules/about/Makefile.in |
38 | --- kvirc-3.2.0.orig/src/modules/about/Makefile.in 2005-02-26 04:35:05.000000000 +0100 |
39 | +++ kvirc-3.2.0/src/modules/about/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
40 | @@ -191,7 +191,7 @@ |
41 | |
42 | libkviabout_la_SOURCES = libkviabout.cpp aboutdialog.cpp |
43 | |
44 | -libkviabout_la_LIBADD = $(SS_LIBLINK) -lkvilib |
45 | +libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
46 | |
47 | noinst_HEADERS = aboutdialog.h |
48 | |
49 | diff -Nru kvirc-3.2.0.orig/src/modules/action/Makefile.am kvirc-3.2.0/src/modules/action/Makefile.am |
50 | --- kvirc-3.2.0.orig/src/modules/action/Makefile.am 2004-12-07 00:04:15.000000000 +0100 |
51 | +++ kvirc-3.2.0/src/modules/action/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
52 | @@ -11,7 +11,7 @@ |
53 | |
54 | libkviaction_la_SOURCES = libkviaction.cpp |
55 | |
56 | -libkviaction_la_LIBADD = $(SS_LIBLINK) -lkvilib |
57 | +libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
58 | |
59 | #noinst_HEADERS= actiondialog.h |
60 | |
61 | diff -Nru kvirc-3.2.0.orig/src/modules/action/Makefile.in kvirc-3.2.0/src/modules/action/Makefile.in |
62 | --- kvirc-3.2.0.orig/src/modules/action/Makefile.in 2005-02-26 04:35:06.000000000 +0100 |
63 | +++ kvirc-3.2.0/src/modules/action/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
64 | @@ -191,7 +191,7 @@ |
65 | |
66 | libkviaction_la_SOURCES = libkviaction.cpp |
67 | |
68 | -libkviaction_la_LIBADD = $(SS_LIBLINK) -lkvilib |
69 | +libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
70 | subdir = src/modules/action |
71 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
72 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
73 | diff -Nru kvirc-3.2.0.orig/src/modules/actioneditor/Makefile.am kvirc-3.2.0/src/modules/actioneditor/Makefile.am |
74 | --- kvirc-3.2.0.orig/src/modules/actioneditor/Makefile.am 2004-12-29 02:48:23.000000000 +0100 |
75 | +++ kvirc-3.2.0/src/modules/actioneditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
76 | @@ -13,7 +13,7 @@ |
77 | nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp |
78 | |
79 | noinst_HEADERS = actioneditor.h |
80 | -libkviactioneditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
81 | +libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
82 | |
83 | # noinst_HEADERS= |
84 | |
85 | diff -Nru kvirc-3.2.0.orig/src/modules/actioneditor/Makefile.in kvirc-3.2.0/src/modules/actioneditor/Makefile.in |
86 | --- kvirc-3.2.0.orig/src/modules/actioneditor/Makefile.in 2005-02-26 04:35:06.000000000 +0100 |
87 | +++ kvirc-3.2.0/src/modules/actioneditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
88 | @@ -193,7 +193,7 @@ |
89 | nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp |
90 | |
91 | noinst_HEADERS = actioneditor.h |
92 | -libkviactioneditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
93 | +libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
94 | subdir = src/modules/actioneditor |
95 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
96 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
97 | diff -Nru kvirc-3.2.0.orig/src/modules/aliaseditor/Makefile.am kvirc-3.2.0/src/modules/aliaseditor/Makefile.am |
98 | --- kvirc-3.2.0.orig/src/modules/aliaseditor/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
99 | +++ kvirc-3.2.0/src/modules/aliaseditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
100 | @@ -13,7 +13,7 @@ |
101 | nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp |
102 | |
103 | noinst_HEADERS = aliaseditor.h |
104 | -libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
105 | +libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
106 | |
107 | # noinst_HEADERS= |
108 | |
109 | diff -Nru kvirc-3.2.0.orig/src/modules/aliaseditor/Makefile.in kvirc-3.2.0/src/modules/aliaseditor/Makefile.in |
110 | --- kvirc-3.2.0.orig/src/modules/aliaseditor/Makefile.in 2005-02-26 04:35:06.000000000 +0100 |
111 | +++ kvirc-3.2.0/src/modules/aliaseditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
112 | @@ -193,7 +193,7 @@ |
113 | nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp |
114 | |
115 | noinst_HEADERS = aliaseditor.h |
116 | -libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
117 | +libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
118 | subdir = src/modules/aliaseditor |
119 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
120 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
121 | diff -Nru kvirc-3.2.0.orig/src/modules/avatar/Makefile.am kvirc-3.2.0/src/modules/avatar/Makefile.am |
122 | --- kvirc-3.2.0.orig/src/modules/avatar/Makefile.am 2004-11-12 04:13:37.000000000 +0100 |
123 | +++ kvirc-3.2.0/src/modules/avatar/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
124 | @@ -12,7 +12,7 @@ |
125 | libkviavatar_la_SOURCES = libkviavatar.cpp |
126 | nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp |
127 | |
128 | -libkviavatar_la_LIBADD = $(SS_LIBLINK) -lkvilib |
129 | +libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
130 | |
131 | noinst_HEADERS = libkviavatar.h |
132 | |
133 | diff -Nru kvirc-3.2.0.orig/src/modules/avatar/Makefile.in kvirc-3.2.0/src/modules/avatar/Makefile.in |
134 | --- kvirc-3.2.0.orig/src/modules/avatar/Makefile.in 2005-02-26 04:35:07.000000000 +0100 |
135 | +++ kvirc-3.2.0/src/modules/avatar/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
136 | @@ -192,7 +192,7 @@ |
137 | libkviavatar_la_SOURCES = libkviavatar.cpp |
138 | nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp |
139 | |
140 | -libkviavatar_la_LIBADD = $(SS_LIBLINK) -lkvilib |
141 | +libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
142 | |
143 | noinst_HEADERS = libkviavatar.h |
144 | subdir = src/modules/avatar |
145 | diff -Nru kvirc-3.2.0.orig/src/modules/chan/Makefile.am kvirc-3.2.0/src/modules/chan/Makefile.am |
146 | --- kvirc-3.2.0.orig/src/modules/chan/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
147 | +++ kvirc-3.2.0/src/modules/chan/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
148 | @@ -10,7 +10,7 @@ |
149 | libkvichan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
150 | |
151 | libkvichan_la_SOURCES = libkvichan.cpp |
152 | -libkvichan_la_LIBADD = $(SS_LIBLINK) -lkvilib |
153 | +libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
154 | |
155 | # noinst_HEADERS= |
156 | |
157 | diff -Nru kvirc-3.2.0.orig/src/modules/chan/Makefile.in kvirc-3.2.0/src/modules/chan/Makefile.in |
158 | --- kvirc-3.2.0.orig/src/modules/chan/Makefile.in 2005-02-26 04:35:07.000000000 +0100 |
159 | +++ kvirc-3.2.0/src/modules/chan/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
160 | @@ -190,7 +190,7 @@ |
161 | libkvichan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
162 | |
163 | libkvichan_la_SOURCES = libkvichan.cpp |
164 | -libkvichan_la_LIBADD = $(SS_LIBLINK) -lkvilib |
165 | +libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
166 | subdir = src/modules/chan |
167 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
168 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
169 | diff -Nru kvirc-3.2.0.orig/src/modules/channelsjoin/Makefile.am kvirc-3.2.0/src/modules/channelsjoin/Makefile.am |
170 | --- kvirc-3.2.0.orig/src/modules/channelsjoin/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
171 | +++ kvirc-3.2.0/src/modules/channelsjoin/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
172 | @@ -10,7 +10,7 @@ |
173 | libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
174 | |
175 | libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp |
176 | -libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) -lkvilib |
177 | +libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
178 | |
179 | noinst_HEADERS= channelsjoinwindow.h |
180 | |
181 | diff -Nru kvirc-3.2.0.orig/src/modules/channelsjoin/Makefile.in kvirc-3.2.0/src/modules/channelsjoin/Makefile.in |
182 | --- kvirc-3.2.0.orig/src/modules/channelsjoin/Makefile.in 2005-02-26 04:35:07.000000000 +0100 |
183 | +++ kvirc-3.2.0/src/modules/channelsjoin/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
184 | @@ -190,7 +190,7 @@ |
185 | libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
186 | |
187 | libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp |
188 | -libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) -lkvilib |
189 | +libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
190 | |
191 | noinst_HEADERS = channelsjoinwindow.h |
192 | subdir = src/modules/channelsjoin |
193 | diff -Nru kvirc-3.2.0.orig/src/modules/clock/Makefile.am kvirc-3.2.0/src/modules/clock/Makefile.am |
194 | --- kvirc-3.2.0.orig/src/modules/clock/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
195 | +++ kvirc-3.2.0/src/modules/clock/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
196 | @@ -10,7 +10,7 @@ |
197 | libkviclock_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
198 | |
199 | libkviclock_la_SOURCES = libkviclock.cpp |
200 | -libkviclock_la_LIBADD = $(SS_LIBLINK) -lkvilib |
201 | +libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
202 | |
203 | noinst_HEADERS= libkviclock.h |
204 | |
205 | diff -Nru kvirc-3.2.0.orig/src/modules/clock/Makefile.in kvirc-3.2.0/src/modules/clock/Makefile.in |
206 | --- kvirc-3.2.0.orig/src/modules/clock/Makefile.in 2005-02-26 04:35:08.000000000 +0100 |
207 | +++ kvirc-3.2.0/src/modules/clock/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
208 | @@ -190,7 +190,7 @@ |
209 | libkviclock_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
210 | |
211 | libkviclock_la_SOURCES = libkviclock.cpp |
212 | -libkviclock_la_LIBADD = $(SS_LIBLINK) -lkvilib |
213 | +libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
214 | |
215 | noinst_HEADERS = libkviclock.h |
216 | subdir = src/modules/clock |
217 | diff -Nru kvirc-3.2.0.orig/src/modules/codetester/Makefile.am kvirc-3.2.0/src/modules/codetester/Makefile.am |
218 | --- kvirc-3.2.0.orig/src/modules/codetester/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
219 | +++ kvirc-3.2.0/src/modules/codetester/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
220 | @@ -9,7 +9,7 @@ |
221 | nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp |
222 | |
223 | noinst_HEADERS = codetester.h |
224 | -libkvicodetester_la_LIBADD = $(SS_LIBLINK) -lkvilib |
225 | +libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
226 | |
227 | # noinst_HEADERS= |
228 | |
229 | diff -Nru kvirc-3.2.0.orig/src/modules/codetester/Makefile.in kvirc-3.2.0/src/modules/codetester/Makefile.in |
230 | --- kvirc-3.2.0.orig/src/modules/codetester/Makefile.in 2005-02-26 04:35:08.000000000 +0100 |
231 | +++ kvirc-3.2.0/src/modules/codetester/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
232 | @@ -188,7 +188,7 @@ |
233 | nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp |
234 | |
235 | noinst_HEADERS = codetester.h |
236 | -libkvicodetester_la_LIBADD = $(SS_LIBLINK) -lkvilib |
237 | +libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
238 | subdir = src/modules/codetester |
239 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
240 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
241 | diff -Nru kvirc-3.2.0.orig/src/modules/config/Makefile.am kvirc-3.2.0/src/modules/config/Makefile.am |
242 | --- kvirc-3.2.0.orig/src/modules/config/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
243 | +++ kvirc-3.2.0/src/modules/config/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
244 | @@ -10,7 +10,7 @@ |
245 | libkviconfig_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
246 | |
247 | libkviconfig_la_SOURCES = libkviconfig.cpp |
248 | -libkviconfig_la_LIBADD = $(SS_LIBLINK) -lkvilib |
249 | +libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
250 | |
251 | # noinst_HEADERS= |
252 | |
253 | diff -Nru kvirc-3.2.0.orig/src/modules/config/Makefile.in kvirc-3.2.0/src/modules/config/Makefile.in |
254 | --- kvirc-3.2.0.orig/src/modules/config/Makefile.in 2005-02-26 04:35:08.000000000 +0100 |
255 | +++ kvirc-3.2.0/src/modules/config/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
256 | @@ -190,7 +190,7 @@ |
257 | libkviconfig_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
258 | |
259 | libkviconfig_la_SOURCES = libkviconfig.cpp |
260 | -libkviconfig_la_LIBADD = $(SS_LIBLINK) -lkvilib |
261 | +libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
262 | subdir = src/modules/config |
263 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
264 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
265 | diff -Nru kvirc-3.2.0.orig/src/modules/dcc/Makefile.am kvirc-3.2.0/src/modules/dcc/Makefile.am |
266 | --- kvirc-3.2.0.orig/src/modules/dcc/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
267 | +++ kvirc-3.2.0/src/modules/dcc/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
268 | @@ -34,7 +34,7 @@ |
269 | voice.cpp \ |
270 | window.cpp |
271 | |
272 | -libkvidcc_la_LIBADD = $(SS_LIBLINK) -lkvilib |
273 | +libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
274 | |
275 | noinst_HEADERS= adpcmcodec.h \ |
276 | broker.h \ |
277 | diff -Nru kvirc-3.2.0.orig/src/modules/dcc/Makefile.in kvirc-3.2.0/src/modules/dcc/Makefile.in |
278 | --- kvirc-3.2.0.orig/src/modules/dcc/Makefile.in 2005-02-26 04:35:08.000000000 +0100 |
279 | +++ kvirc-3.2.0/src/modules/dcc/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
280 | @@ -214,7 +214,7 @@ |
281 | window.cpp |
282 | |
283 | |
284 | -libkvidcc_la_LIBADD = $(SS_LIBLINK) -lkvilib |
285 | +libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
286 | |
287 | noinst_HEADERS = adpcmcodec.h \ |
288 | broker.h \ |
289 | diff -Nru kvirc-3.2.0.orig/src/modules/dialog/Makefile.am kvirc-3.2.0/src/modules/dialog/Makefile.am |
290 | --- kvirc-3.2.0.orig/src/modules/dialog/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
291 | +++ kvirc-3.2.0/src/modules/dialog/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
292 | @@ -11,7 +11,7 @@ |
293 | |
294 | libkvidialog_la_SOURCES = libkvidialog.cpp |
295 | |
296 | -libkvidialog_la_LIBADD = $(SS_LIBLINK) -lkvilib |
297 | +libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
298 | |
299 | noinst_HEADERS= libkvidialog.h |
300 | |
301 | diff -Nru kvirc-3.2.0.orig/src/modules/dialog/Makefile.in kvirc-3.2.0/src/modules/dialog/Makefile.in |
302 | --- kvirc-3.2.0.orig/src/modules/dialog/Makefile.in 2005-02-26 04:35:09.000000000 +0100 |
303 | +++ kvirc-3.2.0/src/modules/dialog/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
304 | @@ -191,7 +191,7 @@ |
305 | |
306 | libkvidialog_la_SOURCES = libkvidialog.cpp |
307 | |
308 | -libkvidialog_la_LIBADD = $(SS_LIBLINK) -lkvilib |
309 | +libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
310 | |
311 | noinst_HEADERS = libkvidialog.h |
312 | subdir = src/modules/dialog |
313 | diff -Nru kvirc-3.2.0.orig/src/modules/dockwidget/Makefile.am kvirc-3.2.0/src/modules/dockwidget/Makefile.am |
314 | --- kvirc-3.2.0.orig/src/modules/dockwidget/Makefile.am 2003-12-18 04:00:44.000000000 +0100 |
315 | +++ kvirc-3.2.0/src/modules/dockwidget/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
316 | @@ -10,7 +10,7 @@ |
317 | libkvidockwidget_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
318 | |
319 | libkvidockwidget_la_SOURCES = libkvidockwidget.cpp |
320 | -libkvidockwidget_la_LIBADD = $(SS_LIBLINK) -lkvilib |
321 | +libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
322 | |
323 | noinst_HEADERS= libkvidockwidget.h |
324 | |
325 | diff -Nru kvirc-3.2.0.orig/src/modules/dockwidget/Makefile.in kvirc-3.2.0/src/modules/dockwidget/Makefile.in |
326 | --- kvirc-3.2.0.orig/src/modules/dockwidget/Makefile.in 2005-02-26 04:35:09.000000000 +0100 |
327 | +++ kvirc-3.2.0/src/modules/dockwidget/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
328 | @@ -190,7 +190,7 @@ |
329 | libkvidockwidget_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
330 | |
331 | libkvidockwidget_la_SOURCES = libkvidockwidget.cpp |
332 | -libkvidockwidget_la_LIBADD = $(SS_LIBLINK) -lkvilib |
333 | +libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
334 | |
335 | noinst_HEADERS = libkvidockwidget.h |
336 | |
337 | diff -Nru kvirc-3.2.0.orig/src/modules/editor/Makefile.am kvirc-3.2.0/src/modules/editor/Makefile.am |
338 | --- kvirc-3.2.0.orig/src/modules/editor/Makefile.am 2004-02-17 01:19:40.000000000 +0100 |
339 | +++ kvirc-3.2.0/src/modules/editor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
340 | @@ -11,7 +11,7 @@ |
341 | |
342 | nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp |
343 | libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp |
344 | -libkvieditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
345 | +libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
346 | |
347 | noinst_HEADERS= scripteditor.h |
348 | |
349 | diff -Nru kvirc-3.2.0.orig/src/modules/editor/Makefile.in kvirc-3.2.0/src/modules/editor/Makefile.in |
350 | --- kvirc-3.2.0.orig/src/modules/editor/Makefile.in 2005-02-26 04:35:09.000000000 +0100 |
351 | +++ kvirc-3.2.0/src/modules/editor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
352 | @@ -191,7 +191,7 @@ |
353 | |
354 | nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp |
355 | libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp |
356 | -libkvieditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
357 | +libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
358 | |
359 | noinst_HEADERS = scripteditor.h |
360 | subdir = src/modules/editor |
361 | diff -Nru kvirc-3.2.0.orig/src/modules/eventeditor/Makefile.am kvirc-3.2.0/src/modules/eventeditor/Makefile.am |
362 | --- kvirc-3.2.0.orig/src/modules/eventeditor/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
363 | +++ kvirc-3.2.0/src/modules/eventeditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
364 | @@ -13,7 +13,7 @@ |
365 | nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp |
366 | |
367 | noinst_HEADERS = eventeditor.h |
368 | -libkvieventeditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
369 | +libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
370 | |
371 | # noinst_HEADERS= |
372 | |
373 | diff -Nru kvirc-3.2.0.orig/src/modules/eventeditor/Makefile.in kvirc-3.2.0/src/modules/eventeditor/Makefile.in |
374 | --- kvirc-3.2.0.orig/src/modules/eventeditor/Makefile.in 2005-02-26 04:35:10.000000000 +0100 |
375 | +++ kvirc-3.2.0/src/modules/eventeditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
376 | @@ -193,7 +193,7 @@ |
377 | nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp |
378 | |
379 | noinst_HEADERS = eventeditor.h |
380 | -libkvieventeditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
381 | +libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
382 | subdir = src/modules/eventeditor |
383 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
384 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
385 | diff -Nru kvirc-3.2.0.orig/src/modules/file/Makefile.am kvirc-3.2.0/src/modules/file/Makefile.am |
386 | --- kvirc-3.2.0.orig/src/modules/file/Makefile.am 2004-11-12 10:10:18.000000000 +0100 |
387 | +++ kvirc-3.2.0/src/modules/file/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
388 | @@ -10,7 +10,7 @@ |
389 | libkvifile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
390 | |
391 | libkvifile_la_SOURCES = libkvifile.cpp |
392 | -libkvifile_la_LIBADD = $(SS_LIBLINK) -lkvilib |
393 | +libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
394 | |
395 | # noinst_HEADERS= |
396 | |
397 | diff -Nru kvirc-3.2.0.orig/src/modules/file/Makefile.in kvirc-3.2.0/src/modules/file/Makefile.in |
398 | --- kvirc-3.2.0.orig/src/modules/file/Makefile.in 2005-02-26 04:35:10.000000000 +0100 |
399 | +++ kvirc-3.2.0/src/modules/file/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
400 | @@ -190,7 +190,7 @@ |
401 | libkvifile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
402 | |
403 | libkvifile_la_SOURCES = libkvifile.cpp |
404 | -libkvifile_la_LIBADD = $(SS_LIBLINK) -lkvilib |
405 | +libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
406 | subdir = src/modules/file |
407 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
408 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
409 | diff -Nru kvirc-3.2.0.orig/src/modules/filetransferwindow/Makefile.am kvirc-3.2.0/src/modules/filetransferwindow/Makefile.am |
410 | --- kvirc-3.2.0.orig/src/modules/filetransferwindow/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
411 | +++ kvirc-3.2.0/src/modules/filetransferwindow/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
412 | @@ -12,7 +12,7 @@ |
413 | libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
414 | |
415 | libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp |
416 | -libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
417 | +libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
418 | |
419 | noinst_HEADERS= filetransferwindow.h |
420 | |
421 | diff -Nru kvirc-3.2.0.orig/src/modules/filetransferwindow/Makefile.in kvirc-3.2.0/src/modules/filetransferwindow/Makefile.in |
422 | --- kvirc-3.2.0.orig/src/modules/filetransferwindow/Makefile.in 2005-02-26 04:35:10.000000000 +0100 |
423 | +++ kvirc-3.2.0/src/modules/filetransferwindow/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
424 | @@ -192,7 +192,7 @@ |
425 | libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
426 | |
427 | libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp |
428 | -libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
429 | +libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
430 | |
431 | noinst_HEADERS = filetransferwindow.h |
432 | subdir = src/modules/filetransferwindow |
433 | diff -Nru kvirc-3.2.0.orig/src/modules/help/Makefile.am kvirc-3.2.0/src/modules/help/Makefile.am |
434 | --- kvirc-3.2.0.orig/src/modules/help/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
435 | +++ kvirc-3.2.0/src/modules/help/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
436 | @@ -10,7 +10,7 @@ |
437 | libkvihelp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
438 | |
439 | libkvihelp_la_SOURCES = libkvihelp.cpp helpwidget.cpp helpwindow.cpp |
440 | -libkvihelp_la_LIBADD = $(SS_LIBLINK) -lkvilib |
441 | +libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
442 | |
443 | noinst_HEADERS= helpwidget.h helpwindow.h |
444 | |
445 | diff -Nru kvirc-3.2.0.orig/src/modules/help/Makefile.in kvirc-3.2.0/src/modules/help/Makefile.in |
446 | --- kvirc-3.2.0.orig/src/modules/help/Makefile.in 2005-02-26 04:35:11.000000000 +0100 |
447 | +++ kvirc-3.2.0/src/modules/help/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
448 | @@ -190,7 +190,7 @@ |
449 | libkvihelp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
450 | |
451 | libkvihelp_la_SOURCES = libkvihelp.cpp helpwidget.cpp helpwindow.cpp |
452 | -libkvihelp_la_LIBADD = $(SS_LIBLINK) -lkvilib |
453 | +libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
454 | |
455 | noinst_HEADERS = helpwidget.h helpwindow.h |
456 | subdir = src/modules/help |
457 | diff -Nru kvirc-3.2.0.orig/src/modules/http/Makefile.am kvirc-3.2.0/src/modules/http/Makefile.am |
458 | --- kvirc-3.2.0.orig/src/modules/http/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
459 | +++ kvirc-3.2.0/src/modules/http/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
460 | @@ -16,7 +16,7 @@ |
461 | libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
462 | |
463 | libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp |
464 | -libkvihttp_la_LIBADD = $(SS_LIBLINK) -lkvilib |
465 | +libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
466 | |
467 | noinst_HEADERS= httpfiletransfer.h |
468 | |
469 | diff -Nru kvirc-3.2.0.orig/src/modules/http/Makefile.in kvirc-3.2.0/src/modules/http/Makefile.in |
470 | --- kvirc-3.2.0.orig/src/modules/http/Makefile.in 2005-02-26 04:35:11.000000000 +0100 |
471 | +++ kvirc-3.2.0/src/modules/http/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
472 | @@ -196,7 +196,7 @@ |
473 | libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
474 | |
475 | libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp |
476 | -libkvihttp_la_LIBADD = $(SS_LIBLINK) -lkvilib |
477 | +libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
478 | |
479 | noinst_HEADERS = httpfiletransfer.h |
480 | subdir = src/modules/http |
481 | diff -Nru kvirc-3.2.0.orig/src/modules/ident/Makefile.am kvirc-3.2.0/src/modules/ident/Makefile.am |
482 | --- kvirc-3.2.0.orig/src/modules/ident/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
483 | +++ kvirc-3.2.0/src/modules/ident/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
484 | @@ -10,7 +10,7 @@ |
485 | libkviident_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
486 | |
487 | libkviident_la_SOURCES = libkviident.cpp |
488 | -libkviident_la_LIBADD = $(SS_LIBLINK) -lkvilib |
489 | +libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
490 | |
491 | noinst_HEADERS= libkviident.h |
492 | |
493 | diff -Nru kvirc-3.2.0.orig/src/modules/ident/Makefile.in kvirc-3.2.0/src/modules/ident/Makefile.in |
494 | --- kvirc-3.2.0.orig/src/modules/ident/Makefile.in 2005-02-26 04:35:12.000000000 +0100 |
495 | +++ kvirc-3.2.0/src/modules/ident/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
496 | @@ -190,7 +190,7 @@ |
497 | libkviident_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
498 | |
499 | libkviident_la_SOURCES = libkviident.cpp |
500 | -libkviident_la_LIBADD = $(SS_LIBLINK) -lkvilib |
501 | +libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
502 | |
503 | noinst_HEADERS = libkviident.h |
504 | subdir = src/modules/ident |
505 | diff -Nru kvirc-3.2.0.orig/src/modules/iograph/Makefile.am kvirc-3.2.0/src/modules/iograph/Makefile.am |
506 | --- kvirc-3.2.0.orig/src/modules/iograph/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
507 | +++ kvirc-3.2.0/src/modules/iograph/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
508 | @@ -10,7 +10,7 @@ |
509 | libkviiograph_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
510 | |
511 | libkviiograph_la_SOURCES = libkviiograph.cpp |
512 | -libkviiograph_la_LIBADD = $(SS_LIBLINK) -lkvilib |
513 | +libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
514 | |
515 | noinst_HEADERS= libkviiograph.h |
516 | |
517 | diff -Nru kvirc-3.2.0.orig/src/modules/iograph/Makefile.in kvirc-3.2.0/src/modules/iograph/Makefile.in |
518 | --- kvirc-3.2.0.orig/src/modules/iograph/Makefile.in 2005-02-26 04:35:12.000000000 +0100 |
519 | +++ kvirc-3.2.0/src/modules/iograph/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
520 | @@ -190,7 +190,7 @@ |
521 | libkviiograph_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
522 | |
523 | libkviiograph_la_SOURCES = libkviiograph.cpp |
524 | -libkviiograph_la_LIBADD = $(SS_LIBLINK) -lkvilib |
525 | +libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
526 | |
527 | noinst_HEADERS = libkviiograph.h |
528 | subdir = src/modules/iograph |
529 | diff -Nru kvirc-3.2.0.orig/src/modules/lag/Makefile.am kvirc-3.2.0/src/modules/lag/Makefile.am |
530 | --- kvirc-3.2.0.orig/src/modules/lag/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
531 | +++ kvirc-3.2.0/src/modules/lag/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
532 | @@ -13,7 +13,7 @@ |
533 | libkvilag_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
534 | |
535 | libkvilag_la_SOURCES = libkvilag.cpp |
536 | -libkvilag_la_LIBADD = $(SS_LIBLINK) -lkvilib |
537 | +libkvilag_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
538 | |
539 | |
540 | #noinst_HEADERS= |
541 | diff -Nru kvirc-3.2.0.orig/src/modules/lag/Makefile.in kvirc-3.2.0/src/modules/lag/Makefile.in |
542 | --- kvirc-3.2.0.orig/src/modules/lag/Makefile.in 2005-02-26 04:35:12.000000000 +0100 |
543 | +++ kvirc-3.2.0/src/modules/lag/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
544 | @@ -193,7 +193,7 @@ |
545 | libkvilag_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
546 | |
547 | libkvilag_la_SOURCES = libkvilag.cpp |
548 | -libkvilag_la_LIBADD = $(SS_LIBLINK) -lkvilib |
549 | +libkvilag_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
550 | subdir = src/modules/lag |
551 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
552 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
553 | diff -Nru kvirc-3.2.0.orig/src/modules/lamerizer/Makefile.am kvirc-3.2.0/src/modules/lamerizer/Makefile.am |
554 | --- kvirc-3.2.0.orig/src/modules/lamerizer/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
555 | +++ kvirc-3.2.0/src/modules/lamerizer/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
556 | @@ -10,7 +10,7 @@ |
557 | libkvilamerizer_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
558 | |
559 | libkvilamerizer_la_SOURCES = libkvilamerizer.cpp |
560 | -libkvilamerizer_la_LIBADD = $(SS_LIBLINK) -lkvilib |
561 | +libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
562 | |
563 | noinst_HEADERS= libkvilamerizer.h |
564 | |
565 | diff -Nru kvirc-3.2.0.orig/src/modules/lamerizer/Makefile.in kvirc-3.2.0/src/modules/lamerizer/Makefile.in |
566 | --- kvirc-3.2.0.orig/src/modules/lamerizer/Makefile.in 2005-02-26 04:35:13.000000000 +0100 |
567 | +++ kvirc-3.2.0/src/modules/lamerizer/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
568 | @@ -190,7 +190,7 @@ |
569 | libkvilamerizer_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
570 | |
571 | libkvilamerizer_la_SOURCES = libkvilamerizer.cpp |
572 | -libkvilamerizer_la_LIBADD = $(SS_LIBLINK) -lkvilib |
573 | +libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
574 | |
575 | noinst_HEADERS = libkvilamerizer.h |
576 | |
577 | diff -Nru kvirc-3.2.0.orig/src/modules/links/Makefile.am kvirc-3.2.0/src/modules/links/Makefile.am |
578 | --- kvirc-3.2.0.orig/src/modules/links/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
579 | +++ kvirc-3.2.0/src/modules/links/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
580 | @@ -10,7 +10,7 @@ |
581 | libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
582 | |
583 | libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp |
584 | -libkvilinks_la_LIBADD = $(SS_LIBLINK) -lkvilib |
585 | +libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
586 | |
587 | noinst_HEADERS= linkswindow.h |
588 | |
589 | diff -Nru kvirc-3.2.0.orig/src/modules/links/Makefile.in kvirc-3.2.0/src/modules/links/Makefile.in |
590 | --- kvirc-3.2.0.orig/src/modules/links/Makefile.in 2005-02-26 04:35:13.000000000 +0100 |
591 | +++ kvirc-3.2.0/src/modules/links/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
592 | @@ -190,7 +190,7 @@ |
593 | libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
594 | |
595 | libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp |
596 | -libkvilinks_la_LIBADD = $(SS_LIBLINK) -lkvilib |
597 | +libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
598 | |
599 | noinst_HEADERS = linkswindow.h |
600 | subdir = src/modules/links |
601 | diff -Nru kvirc-3.2.0.orig/src/modules/list/Makefile.am kvirc-3.2.0/src/modules/list/Makefile.am |
602 | --- kvirc-3.2.0.orig/src/modules/list/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
603 | +++ kvirc-3.2.0/src/modules/list/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
604 | @@ -10,7 +10,7 @@ |
605 | libkvilist_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
606 | |
607 | libkvilist_la_SOURCES = libkvilist.cpp listwindow.cpp |
608 | -libkvilist_la_LIBADD = $(SS_LIBLINK) -lkvilib |
609 | +libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
610 | |
611 | noinst_HEADERS= listwindow.h |
612 | |
613 | diff -Nru kvirc-3.2.0.orig/src/modules/list/Makefile.in kvirc-3.2.0/src/modules/list/Makefile.in |
614 | --- kvirc-3.2.0.orig/src/modules/list/Makefile.in 2005-02-26 04:35:13.000000000 +0100 |
615 | +++ kvirc-3.2.0/src/modules/list/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
616 | @@ -190,7 +190,7 @@ |
617 | libkvilist_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
618 | |
619 | libkvilist_la_SOURCES = libkvilist.cpp listwindow.cpp |
620 | -libkvilist_la_LIBADD = $(SS_LIBLINK) -lkvilib |
621 | +libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
622 | |
623 | noinst_HEADERS = listwindow.h |
624 | subdir = src/modules/list |
625 | diff -Nru kvirc-3.2.0.orig/src/modules/log/Makefile.am kvirc-3.2.0/src/modules/log/Makefile.am |
626 | --- kvirc-3.2.0.orig/src/modules/log/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
627 | +++ kvirc-3.2.0/src/modules/log/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
628 | @@ -10,7 +10,7 @@ |
629 | libkvilog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
630 | |
631 | libkvilog_la_SOURCES = libkvilog.cpp |
632 | -libkvilog_la_LIBADD = $(SS_LIBLINK) -lkvilib |
633 | +libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
634 | |
635 | # noinst_HEADERS= |
636 | |
637 | diff -Nru kvirc-3.2.0.orig/src/modules/log/Makefile.in kvirc-3.2.0/src/modules/log/Makefile.in |
638 | --- kvirc-3.2.0.orig/src/modules/log/Makefile.in 2005-02-26 04:35:13.000000000 +0100 |
639 | +++ kvirc-3.2.0/src/modules/log/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
640 | @@ -190,7 +190,7 @@ |
641 | libkvilog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
642 | |
643 | libkvilog_la_SOURCES = libkvilog.cpp |
644 | -libkvilog_la_LIBADD = $(SS_LIBLINK) -lkvilib |
645 | +libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
646 | subdir = src/modules/log |
647 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
648 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
649 | diff -Nru kvirc-3.2.0.orig/src/modules/logview/Makefile.am kvirc-3.2.0/src/modules/logview/Makefile.am |
650 | --- kvirc-3.2.0.orig/src/modules/logview/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
651 | +++ kvirc-3.2.0/src/modules/logview/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
652 | @@ -12,7 +12,7 @@ |
653 | libkvilogview_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
654 | |
655 | libkvilogview_la_SOURCES = libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp |
656 | -libkvilogview_la_LIBADD = $(SS_LIBLINK) -lkvilib |
657 | +libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
658 | |
659 | noinst_HEADERS= logviewwidget.h logviewmdiwindow.h |
660 | |
661 | diff -Nru kvirc-3.2.0.orig/src/modules/logview/Makefile.in kvirc-3.2.0/src/modules/logview/Makefile.in |
662 | --- kvirc-3.2.0.orig/src/modules/logview/Makefile.in 2005-02-26 04:35:14.000000000 +0100 |
663 | +++ kvirc-3.2.0/src/modules/logview/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
664 | @@ -192,7 +192,7 @@ |
665 | libkvilogview_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
666 | |
667 | libkvilogview_la_SOURCES = libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp |
668 | -libkvilogview_la_LIBADD = $(SS_LIBLINK) -lkvilib |
669 | +libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
670 | |
671 | noinst_HEADERS = logviewwidget.h logviewmdiwindow.h |
672 | subdir = src/modules/logview |
673 | diff -Nru kvirc-3.2.0.orig/src/modules/mask/Makefile.am kvirc-3.2.0/src/modules/mask/Makefile.am |
674 | --- kvirc-3.2.0.orig/src/modules/mask/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
675 | +++ kvirc-3.2.0/src/modules/mask/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
676 | @@ -10,7 +10,7 @@ |
677 | libkvimask_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
678 | |
679 | libkvimask_la_SOURCES = libkvimask.cpp |
680 | -libkvimask_la_LIBADD = $(SS_LIBLINK) -lkvilib |
681 | +libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
682 | |
683 | # noinst_HEADERS= |
684 | |
685 | diff -Nru kvirc-3.2.0.orig/src/modules/mask/Makefile.in kvirc-3.2.0/src/modules/mask/Makefile.in |
686 | --- kvirc-3.2.0.orig/src/modules/mask/Makefile.in 2005-02-26 04:35:14.000000000 +0100 |
687 | +++ kvirc-3.2.0/src/modules/mask/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
688 | @@ -190,7 +190,7 @@ |
689 | libkvimask_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
690 | |
691 | libkvimask_la_SOURCES = libkvimask.cpp |
692 | -libkvimask_la_LIBADD = $(SS_LIBLINK) -lkvilib |
693 | +libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
694 | subdir = src/modules/mask |
695 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
696 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
697 | diff -Nru kvirc-3.2.0.orig/src/modules/mircimport/Makefile.am kvirc-3.2.0/src/modules/mircimport/Makefile.am |
698 | --- kvirc-3.2.0.orig/src/modules/mircimport/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
699 | +++ kvirc-3.2.0/src/modules/mircimport/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
700 | @@ -12,7 +12,7 @@ |
701 | libkvimircimport_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
702 | |
703 | libkvimircimport_la_SOURCES = libkvimircimport.cpp |
704 | -libkvimircimport_la_LIBADD = $(SS_LIBLINK) -lkvilib |
705 | +libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
706 | |
707 | noinst_HEADERS= libkvimircimport.h |
708 | |
709 | diff -Nru kvirc-3.2.0.orig/src/modules/mircimport/Makefile.in kvirc-3.2.0/src/modules/mircimport/Makefile.in |
710 | --- kvirc-3.2.0.orig/src/modules/mircimport/Makefile.in 2005-02-26 04:35:15.000000000 +0100 |
711 | +++ kvirc-3.2.0/src/modules/mircimport/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
712 | @@ -192,7 +192,7 @@ |
713 | libkvimircimport_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
714 | |
715 | libkvimircimport_la_SOURCES = libkvimircimport.cpp |
716 | -libkvimircimport_la_LIBADD = $(SS_LIBLINK) -lkvilib |
717 | +libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
718 | |
719 | noinst_HEADERS = libkvimircimport.h |
720 | subdir = src/modules/mircimport |
721 | diff -Nru kvirc-3.2.0.orig/src/modules/mp3player/Makefile.am kvirc-3.2.0/src/modules/mp3player/Makefile.am |
722 | --- kvirc-3.2.0.orig/src/modules/mp3player/Makefile.am 2005-02-23 21:02:48.000000000 +0100 |
723 | +++ kvirc-3.2.0/src/modules/mp3player/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
724 | @@ -10,7 +10,7 @@ |
725 | libkvimp3player_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
726 | |
727 | libkvimp3player_la_SOURCES = libkvimp3player.cpp mp3tech.cpp |
728 | -libkvimp3player_la_LIBADD = $(SS_LIBLINK) -lkvilib |
729 | +libkvimp3player_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
730 | |
731 | noinst_HEADERS= libkvimp3player.h mp3tech.h |
732 | |
733 | diff -Nru kvirc-3.2.0.orig/src/modules/mp3player/Makefile.in kvirc-3.2.0/src/modules/mp3player/Makefile.in |
734 | --- kvirc-3.2.0.orig/src/modules/mp3player/Makefile.in 2005-02-26 04:35:15.000000000 +0100 |
735 | +++ kvirc-3.2.0/src/modules/mp3player/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
736 | @@ -190,7 +190,7 @@ |
737 | libkvimp3player_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
738 | |
739 | libkvimp3player_la_SOURCES = libkvimp3player.cpp mp3tech.cpp |
740 | -libkvimp3player_la_LIBADD = $(SS_LIBLINK) -lkvilib |
741 | +libkvimp3player_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
742 | |
743 | noinst_HEADERS = libkvimp3player.h mp3tech.h |
744 | subdir = src/modules/mp3player |
745 | diff -Nru kvirc-3.2.0.orig/src/modules/my/Makefile.am kvirc-3.2.0/src/modules/my/Makefile.am |
746 | --- kvirc-3.2.0.orig/src/modules/my/Makefile.am 2003-12-18 04:00:45.000000000 +0100 |
747 | +++ kvirc-3.2.0/src/modules/my/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
748 | @@ -10,7 +10,7 @@ |
749 | libkvimy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
750 | |
751 | libkvimy_la_SOURCES = libkvimy.cpp |
752 | -libkvimy_la_LIBADD = $(SS_LIBLINK) -lkvilib |
753 | +libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
754 | |
755 | # noinst_HEADERS= |
756 | |
757 | diff -Nru kvirc-3.2.0.orig/src/modules/my/Makefile.in kvirc-3.2.0/src/modules/my/Makefile.in |
758 | --- kvirc-3.2.0.orig/src/modules/my/Makefile.in 2005-02-26 04:35:15.000000000 +0100 |
759 | +++ kvirc-3.2.0/src/modules/my/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
760 | @@ -190,7 +190,7 @@ |
761 | libkvimy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
762 | |
763 | libkvimy_la_SOURCES = libkvimy.cpp |
764 | -libkvimy_la_LIBADD = $(SS_LIBLINK) -lkvilib |
765 | +libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
766 | subdir = src/modules/my |
767 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
768 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
769 | diff -Nru kvirc-3.2.0.orig/src/modules/notifier/Makefile.am kvirc-3.2.0/src/modules/notifier/Makefile.am |
770 | --- kvirc-3.2.0.orig/src/modules/notifier/Makefile.am 2005-01-28 00:42:59.000000000 +0100 |
771 | +++ kvirc-3.2.0/src/modules/notifier/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
772 | @@ -18,7 +18,7 @@ |
773 | notifierwindowbody.cpp \ |
774 | notifierwindowborder.cpp |
775 | |
776 | -libkvinotifier_la_LIBADD = $(SS_LIBLINK) -lkvilib |
777 | +libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
778 | |
779 | noinst_HEADERS= \ |
780 | notifiersettings.h \ |
781 | diff -Nru kvirc-3.2.0.orig/src/modules/notifier/Makefile.in kvirc-3.2.0/src/modules/notifier/Makefile.in |
782 | --- kvirc-3.2.0.orig/src/modules/notifier/Makefile.in 2005-02-26 04:35:16.000000000 +0100 |
783 | +++ kvirc-3.2.0/src/modules/notifier/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
784 | @@ -199,7 +199,7 @@ |
785 | notifierwindowborder.cpp |
786 | |
787 | |
788 | -libkvinotifier_la_LIBADD = $(SS_LIBLINK) -lkvilib |
789 | +libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
790 | |
791 | noinst_HEADERS = \ |
792 | notifiersettings.h \ |
793 | diff -Nru kvirc-3.2.0.orig/src/modules/objects/Makefile.am kvirc-3.2.0/src/modules/objects/Makefile.am |
794 | --- kvirc-3.2.0.orig/src/modules/objects/Makefile.am 2005-02-14 21:27:55.000000000 +0100 |
795 | +++ kvirc-3.2.0/src/modules/objects/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
796 | @@ -37,7 +37,7 @@ |
797 | class_window.cpp \ |
798 | class_workspace.cpp |
799 | |
800 | -libkviobjects_la_LIBADD = $(SS_LIBLINK) -lkvilib |
801 | +libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
802 | |
803 | noinst_HEADERS= class_button.h \ |
804 | class_checkbox.h \ |
805 | diff -Nru kvirc-3.2.0.orig/src/modules/objects/Makefile.in kvirc-3.2.0/src/modules/objects/Makefile.in |
806 | --- kvirc-3.2.0.orig/src/modules/objects/Makefile.in 2005-02-26 04:35:17.000000000 +0100 |
807 | +++ kvirc-3.2.0/src/modules/objects/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
808 | @@ -218,7 +218,7 @@ |
809 | class_workspace.cpp |
810 | |
811 | |
812 | -libkviobjects_la_LIBADD = $(SS_LIBLINK) -lkvilib |
813 | +libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
814 | |
815 | noinst_HEADERS = class_button.h \ |
816 | class_checkbox.h \ |
817 | diff -Nru kvirc-3.2.0.orig/src/modules/options/Makefile.am kvirc-3.2.0/src/modules/options/Makefile.am |
818 | --- kvirc-3.2.0.orig/src/modules/options/Makefile.am 2004-03-04 04:56:12.000000000 +0100 |
819 | +++ kvirc-3.2.0/src/modules/options/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
820 | @@ -57,7 +57,7 @@ |
821 | optw_urlhandlers.cpp \ |
822 | optw_userlist.cpp |
823 | |
824 | -libkvioptions_la_LIBADD = $(SS_LIBLINK) -lkvilib |
825 | +libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
826 | |
827 | noinst_HEADERS= container.h \ |
828 | dlg_options.h \ |
829 | diff -Nru kvirc-3.2.0.orig/src/modules/options/Makefile.in kvirc-3.2.0/src/modules/options/Makefile.in |
830 | --- kvirc-3.2.0.orig/src/modules/options/Makefile.in 2005-02-26 04:35:17.000000000 +0100 |
831 | +++ kvirc-3.2.0/src/modules/options/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
832 | @@ -238,7 +238,7 @@ |
833 | optw_userlist.cpp |
834 | |
835 | |
836 | -libkvioptions_la_LIBADD = $(SS_LIBLINK) -lkvilib |
837 | +libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
838 | |
839 | noinst_HEADERS = container.h \ |
840 | dlg_options.h \ |
841 | diff -Nru kvirc-3.2.0.orig/src/modules/perl/Makefile.am kvirc-3.2.0/src/modules/perl/Makefile.am |
842 | --- kvirc-3.2.0.orig/src/modules/perl/Makefile.am 2004-07-13 13:58:25.000000000 +0200 |
843 | +++ kvirc-3.2.0/src/modules/perl/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
844 | @@ -10,7 +10,7 @@ |
845 | libkviperl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
846 | |
847 | libkviperl_la_SOURCES = libkviperl.cpp |
848 | -libkviperl_la_LIBADD = $(SS_LIBLINK) -lkvilib |
849 | +libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
850 | |
851 | # noinst_HEADERS= |
852 | |
853 | diff -Nru kvirc-3.2.0.orig/src/modules/perl/Makefile.in kvirc-3.2.0/src/modules/perl/Makefile.in |
854 | --- kvirc-3.2.0.orig/src/modules/perl/Makefile.in 2005-02-26 04:35:17.000000000 +0100 |
855 | +++ kvirc-3.2.0/src/modules/perl/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
856 | @@ -190,7 +190,7 @@ |
857 | libkviperl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
858 | |
859 | libkviperl_la_SOURCES = libkviperl.cpp |
860 | -libkviperl_la_LIBADD = $(SS_LIBLINK) -lkvilib |
861 | +libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
862 | subdir = src/modules/perl |
863 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
864 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
865 | diff -Nru kvirc-3.2.0.orig/src/modules/perlcore/Makefile.am kvirc-3.2.0/src/modules/perlcore/Makefile.am |
866 | --- kvirc-3.2.0.orig/src/modules/perlcore/Makefile.am 2004-07-20 04:30:54.000000000 +0200 |
867 | +++ kvirc-3.2.0/src/modules/perlcore/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
868 | @@ -10,7 +10,7 @@ |
869 | libkviperlcore_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_PERL_LDFLAGS) |
870 | |
871 | libkviperlcore_la_SOURCES = libkviperlcore.cpp |
872 | -libkviperlcore_la_LIBADD = $(SS_LIBLINK) -lkvilib |
873 | +libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
874 | |
875 | noinst_HEADERS = perlcoreinterface.h |
876 | |
877 | diff -Nru kvirc-3.2.0.orig/src/modules/perlcore/Makefile.in kvirc-3.2.0/src/modules/perlcore/Makefile.in |
878 | --- kvirc-3.2.0.orig/src/modules/perlcore/Makefile.in 2005-02-26 04:35:18.000000000 +0100 |
879 | +++ kvirc-3.2.0/src/modules/perlcore/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
880 | @@ -190,7 +190,7 @@ |
881 | libkviperlcore_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_PERL_LDFLAGS) |
882 | |
883 | libkviperlcore_la_SOURCES = libkviperlcore.cpp |
884 | -libkviperlcore_la_LIBADD = $(SS_LIBLINK) -lkvilib |
885 | +libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
886 | |
887 | noinst_HEADERS = perlcoreinterface.h |
888 | |
889 | diff -Nru kvirc-3.2.0.orig/src/modules/popupeditor/Makefile.am kvirc-3.2.0/src/modules/popupeditor/Makefile.am |
890 | --- kvirc-3.2.0.orig/src/modules/popupeditor/Makefile.am 2003-12-18 04:00:46.000000000 +0100 |
891 | +++ kvirc-3.2.0/src/modules/popupeditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
892 | @@ -9,7 +9,7 @@ |
893 | nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp |
894 | |
895 | noinst_HEADERS = popupeditor.h |
896 | -libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
897 | +libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
898 | |
899 | # noinst_HEADERS= |
900 | |
901 | diff -Nru kvirc-3.2.0.orig/src/modules/popupeditor/Makefile.in kvirc-3.2.0/src/modules/popupeditor/Makefile.in |
902 | --- kvirc-3.2.0.orig/src/modules/popupeditor/Makefile.in 2005-02-26 04:35:18.000000000 +0100 |
903 | +++ kvirc-3.2.0/src/modules/popupeditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
904 | @@ -188,7 +188,7 @@ |
905 | nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp |
906 | |
907 | noinst_HEADERS = popupeditor.h |
908 | -libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
909 | +libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
910 | subdir = src/modules/popupeditor |
911 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
912 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
913 | diff -Nru kvirc-3.2.0.orig/src/modules/raweditor/Makefile.am kvirc-3.2.0/src/modules/raweditor/Makefile.am |
914 | --- kvirc-3.2.0.orig/src/modules/raweditor/Makefile.am 2003-12-18 04:00:46.000000000 +0100 |
915 | +++ kvirc-3.2.0/src/modules/raweditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
916 | @@ -9,7 +9,7 @@ |
917 | nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp |
918 | |
919 | noinst_HEADERS = raweditor.h |
920 | -libkviraweditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
921 | +libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
922 | |
923 | # noinst_HEADERS= |
924 | |
925 | diff -Nru kvirc-3.2.0.orig/src/modules/raweditor/Makefile.in kvirc-3.2.0/src/modules/raweditor/Makefile.in |
926 | --- kvirc-3.2.0.orig/src/modules/raweditor/Makefile.in 2005-02-26 04:35:19.000000000 +0100 |
927 | +++ kvirc-3.2.0/src/modules/raweditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
928 | @@ -188,7 +188,7 @@ |
929 | nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp |
930 | |
931 | noinst_HEADERS = raweditor.h |
932 | -libkviraweditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
933 | +libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
934 | subdir = src/modules/raweditor |
935 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
936 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
937 | diff -Nru kvirc-3.2.0.orig/src/modules/regchan/Makefile.am kvirc-3.2.0/src/modules/regchan/Makefile.am |
938 | --- kvirc-3.2.0.orig/src/modules/regchan/Makefile.am 2003-12-18 04:00:46.000000000 +0100 |
939 | +++ kvirc-3.2.0/src/modules/regchan/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
940 | @@ -10,7 +10,7 @@ |
941 | libkviregchan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
942 | |
943 | libkviregchan_la_SOURCES = libkviregchan.cpp |
944 | -libkviregchan_la_LIBADD = $(SS_LIBLINK) -lkvilib |
945 | +libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
946 | |
947 | #noinst_HEADERS= edituser.h |
948 | |
949 | diff -Nru kvirc-3.2.0.orig/src/modules/regchan/Makefile.in kvirc-3.2.0/src/modules/regchan/Makefile.in |
950 | --- kvirc-3.2.0.orig/src/modules/regchan/Makefile.in 2005-02-26 04:35:19.000000000 +0100 |
951 | +++ kvirc-3.2.0/src/modules/regchan/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
952 | @@ -190,7 +190,7 @@ |
953 | libkviregchan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
954 | |
955 | libkviregchan_la_SOURCES = libkviregchan.cpp |
956 | -libkviregchan_la_LIBADD = $(SS_LIBLINK) -lkvilib |
957 | +libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
958 | subdir = src/modules/regchan |
959 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
960 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
961 | diff -Nru kvirc-3.2.0.orig/src/modules/reguser/Makefile.am kvirc-3.2.0/src/modules/reguser/Makefile.am |
962 | --- kvirc-3.2.0.orig/src/modules/reguser/Makefile.am 2003-12-18 04:00:46.000000000 +0100 |
963 | +++ kvirc-3.2.0/src/modules/reguser/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
964 | @@ -10,7 +10,7 @@ |
965 | libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
966 | |
967 | libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp |
968 | -libkvireguser_la_LIBADD = $(SS_LIBLINK) -lkvilib |
969 | +libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
970 | |
971 | noinst_HEADERS= edituser.h wizard.h |
972 | |
973 | diff -Nru kvirc-3.2.0.orig/src/modules/reguser/Makefile.in kvirc-3.2.0/src/modules/reguser/Makefile.in |
974 | --- kvirc-3.2.0.orig/src/modules/reguser/Makefile.in 2005-02-26 04:35:19.000000000 +0100 |
975 | +++ kvirc-3.2.0/src/modules/reguser/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
976 | @@ -190,7 +190,7 @@ |
977 | libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
978 | |
979 | libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp |
980 | -libkvireguser_la_LIBADD = $(SS_LIBLINK) -lkvilib |
981 | +libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
982 | |
983 | noinst_HEADERS = edituser.h wizard.h |
984 | subdir = src/modules/reguser |
985 | diff -Nru kvirc-3.2.0.orig/src/modules/rijndael/libkvirijndael.cpp kvirc-3.2.0/src/modules/rijndael/libkvirijndael.cpp |
986 | --- kvirc-3.2.0.orig/src/modules/rijndael/libkvirijndael.cpp 2005-02-25 00:01:51.000000000 +0100 |
987 | +++ kvirc-3.2.0/src/modules/rijndael/libkvirijndael.cpp 2005-03-07 16:53:12.000000000 +0100 |
988 | @@ -223,7 +223,18 @@ |
989 | } |
990 | |
991 | if(*inBuffer != KVI_TEXT_CRYPTESCAPE) |
992 | + { |
993 | + plainText = inBuffer; |
994 | return KviCryptEngine::DecryptOkWasPlainText; |
995 | + } |
996 | + |
997 | + inBuffer++; |
998 | + |
999 | + if(!*inBuffer) |
1000 | + { |
1001 | + plainText = inBuffer; |
1002 | + return KviCryptEngine::DecryptOkWasPlainText; // empty buffer |
1003 | + } |
1004 | |
1005 | int len; |
1006 | char * binary; |
1007 | diff -Nru kvirc-3.2.0.orig/src/modules/rijndael/Makefile.am kvirc-3.2.0/src/modules/rijndael/Makefile.am |
1008 | --- kvirc-3.2.0.orig/src/modules/rijndael/Makefile.am 2005-01-13 03:29:42.000000000 +0100 |
1009 | +++ kvirc-3.2.0/src/modules/rijndael/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1010 | @@ -12,7 +12,7 @@ |
1011 | libkvirijndael_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1012 | |
1013 | libkvirijndael_la_SOURCES = libkvirijndael.cpp rijndael.cpp ablowfish.cpp |
1014 | -libkvirijndael_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1015 | +libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1016 | |
1017 | noinst_HEADERS= libkvirijndael.h rijndael.h ablowfish.h |
1018 | |
1019 | diff -Nru kvirc-3.2.0.orig/src/modules/rijndael/Makefile.in kvirc-3.2.0/src/modules/rijndael/Makefile.in |
1020 | --- kvirc-3.2.0.orig/src/modules/rijndael/Makefile.in 2005-02-26 04:35:20.000000000 +0100 |
1021 | +++ kvirc-3.2.0/src/modules/rijndael/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1022 | @@ -192,7 +192,7 @@ |
1023 | libkvirijndael_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1024 | |
1025 | libkvirijndael_la_SOURCES = libkvirijndael.cpp rijndael.cpp ablowfish.cpp |
1026 | -libkvirijndael_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1027 | +libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1028 | |
1029 | noinst_HEADERS = libkvirijndael.h rijndael.h ablowfish.h |
1030 | subdir = src/modules/rijndael |
1031 | diff -Nru kvirc-3.2.0.orig/src/modules/setup/Makefile.am kvirc-3.2.0/src/modules/setup/Makefile.am |
1032 | --- kvirc-3.2.0.orig/src/modules/setup/Makefile.am 2003-12-18 04:00:46.000000000 +0100 |
1033 | +++ kvirc-3.2.0/src/modules/setup/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1034 | @@ -10,7 +10,7 @@ |
1035 | libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1036 | |
1037 | libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp |
1038 | -libkvisetup_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1039 | +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1040 | |
1041 | noinst_HEADERS= setupwizard.h |
1042 | |
1043 | diff -Nru kvirc-3.2.0.orig/src/modules/setup/Makefile.in kvirc-3.2.0/src/modules/setup/Makefile.in |
1044 | --- kvirc-3.2.0.orig/src/modules/setup/Makefile.in 2005-02-26 04:35:20.000000000 +0100 |
1045 | +++ kvirc-3.2.0/src/modules/setup/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1046 | @@ -190,7 +190,7 @@ |
1047 | libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1048 | |
1049 | libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp |
1050 | -libkvisetup_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1051 | +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1052 | |
1053 | noinst_HEADERS = setupwizard.h |
1054 | subdir = src/modules/setup |
1055 | diff -Nru kvirc-3.2.0.orig/src/modules/sharedfile/Makefile.am kvirc-3.2.0/src/modules/sharedfile/Makefile.am |
1056 | --- kvirc-3.2.0.orig/src/modules/sharedfile/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1057 | +++ kvirc-3.2.0/src/modules/sharedfile/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1058 | @@ -10,7 +10,7 @@ |
1059 | libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1060 | |
1061 | libkvisharedfile_la_SOURCES = libkvisharedfile.cpp |
1062 | -libkvisharedfile_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1063 | +libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1064 | |
1065 | #noinst_HEADERS= sharedfilewindow.h |
1066 | |
1067 | diff -Nru kvirc-3.2.0.orig/src/modules/sharedfile/Makefile.in kvirc-3.2.0/src/modules/sharedfile/Makefile.in |
1068 | --- kvirc-3.2.0.orig/src/modules/sharedfile/Makefile.in 2005-02-26 04:35:20.000000000 +0100 |
1069 | +++ kvirc-3.2.0/src/modules/sharedfile/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1070 | @@ -190,7 +190,7 @@ |
1071 | libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1072 | |
1073 | libkvisharedfile_la_SOURCES = libkvisharedfile.cpp |
1074 | -libkvisharedfile_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1075 | +libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1076 | subdir = src/modules/sharedfile |
1077 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1078 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1079 | diff -Nru kvirc-3.2.0.orig/src/modules/sharedfileswindow/Makefile.am kvirc-3.2.0/src/modules/sharedfileswindow/Makefile.am |
1080 | --- kvirc-3.2.0.orig/src/modules/sharedfileswindow/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1081 | +++ kvirc-3.2.0/src/modules/sharedfileswindow/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1082 | @@ -12,7 +12,7 @@ |
1083 | libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1084 | |
1085 | libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp |
1086 | -libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1087 | +libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1088 | |
1089 | noinst_HEADERS= sharedfileswindow.h |
1090 | |
1091 | diff -Nru kvirc-3.2.0.orig/src/modules/sharedfileswindow/Makefile.in kvirc-3.2.0/src/modules/sharedfileswindow/Makefile.in |
1092 | --- kvirc-3.2.0.orig/src/modules/sharedfileswindow/Makefile.in 2005-02-26 04:35:21.000000000 +0100 |
1093 | +++ kvirc-3.2.0/src/modules/sharedfileswindow/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1094 | @@ -192,7 +192,7 @@ |
1095 | libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1096 | |
1097 | libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp |
1098 | -libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1099 | +libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1100 | |
1101 | noinst_HEADERS = sharedfileswindow.h |
1102 | subdir = src/modules/sharedfileswindow |
1103 | diff -Nru kvirc-3.2.0.orig/src/modules/snd/Makefile.am kvirc-3.2.0/src/modules/snd/Makefile.am |
1104 | --- kvirc-3.2.0.orig/src/modules/snd/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1105 | +++ kvirc-3.2.0/src/modules/snd/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1106 | @@ -11,7 +11,7 @@ |
1107 | libkvisnd_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1108 | |
1109 | libkvisnd_la_SOURCES = libkvisnd.cpp |
1110 | -libkvisnd_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1111 | +libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1112 | |
1113 | |
1114 | noinst_HEADERS= libkvisnd.h |
1115 | diff -Nru kvirc-3.2.0.orig/src/modules/snd/Makefile.in kvirc-3.2.0/src/modules/snd/Makefile.in |
1116 | --- kvirc-3.2.0.orig/src/modules/snd/Makefile.in 2005-02-26 04:35:22.000000000 +0100 |
1117 | +++ kvirc-3.2.0/src/modules/snd/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1118 | @@ -191,7 +191,7 @@ |
1119 | libkvisnd_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1120 | |
1121 | libkvisnd_la_SOURCES = libkvisnd.cpp |
1122 | -libkvisnd_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1123 | +libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1124 | |
1125 | noinst_HEADERS = libkvisnd.h |
1126 | subdir = src/modules/snd |
1127 | diff -Nru kvirc-3.2.0.orig/src/modules/socketspy/Makefile.am kvirc-3.2.0/src/modules/socketspy/Makefile.am |
1128 | --- kvirc-3.2.0.orig/src/modules/socketspy/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1129 | +++ kvirc-3.2.0/src/modules/socketspy/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1130 | @@ -10,7 +10,7 @@ |
1131 | libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1132 | |
1133 | libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp |
1134 | -libkvisocketspy_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1135 | +libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1136 | |
1137 | noinst_HEADERS= socketspywindow.h |
1138 | |
1139 | diff -Nru kvirc-3.2.0.orig/src/modules/socketspy/Makefile.in kvirc-3.2.0/src/modules/socketspy/Makefile.in |
1140 | --- kvirc-3.2.0.orig/src/modules/socketspy/Makefile.in 2005-02-26 04:35:22.000000000 +0100 |
1141 | +++ kvirc-3.2.0/src/modules/socketspy/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1142 | @@ -190,7 +190,7 @@ |
1143 | libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1144 | |
1145 | libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp |
1146 | -libkvisocketspy_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1147 | +libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1148 | |
1149 | noinst_HEADERS = socketspywindow.h |
1150 | subdir = src/modules/socketspy |
1151 | diff -Nru kvirc-3.2.0.orig/src/modules/spaste/Makefile.am kvirc-3.2.0/src/modules/spaste/Makefile.am |
1152 | --- kvirc-3.2.0.orig/src/modules/spaste/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1153 | +++ kvirc-3.2.0/src/modules/spaste/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1154 | @@ -13,7 +13,7 @@ |
1155 | libkvispaste_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1156 | |
1157 | libkvispaste_la_SOURCES = libkvispaste.cpp controller.cpp |
1158 | -libkvispaste_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1159 | +libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1160 | |
1161 | |
1162 | noinst_HEADERS= controller.h libkvispaste.h |
1163 | diff -Nru kvirc-3.2.0.orig/src/modules/spaste/Makefile.in kvirc-3.2.0/src/modules/spaste/Makefile.in |
1164 | --- kvirc-3.2.0.orig/src/modules/spaste/Makefile.in 2005-02-26 04:35:23.000000000 +0100 |
1165 | +++ kvirc-3.2.0/src/modules/spaste/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1166 | @@ -193,7 +193,7 @@ |
1167 | libkvispaste_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1168 | |
1169 | libkvispaste_la_SOURCES = libkvispaste.cpp controller.cpp |
1170 | -libkvispaste_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1171 | +libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1172 | |
1173 | noinst_HEADERS = controller.h libkvispaste.h |
1174 | subdir = src/modules/spaste |
1175 | diff -Nru kvirc-3.2.0.orig/src/modules/str/Makefile.am kvirc-3.2.0/src/modules/str/Makefile.am |
1176 | --- kvirc-3.2.0.orig/src/modules/str/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1177 | +++ kvirc-3.2.0/src/modules/str/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1178 | @@ -10,7 +10,7 @@ |
1179 | libkvistr_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1180 | |
1181 | libkvistr_la_SOURCES = libkvistr.cpp |
1182 | -libkvistr_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1183 | +libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1184 | |
1185 | # noinst_HEADERS= |
1186 | |
1187 | diff -Nru kvirc-3.2.0.orig/src/modules/str/Makefile.in kvirc-3.2.0/src/modules/str/Makefile.in |
1188 | --- kvirc-3.2.0.orig/src/modules/str/Makefile.in 2005-02-26 04:35:23.000000000 +0100 |
1189 | +++ kvirc-3.2.0/src/modules/str/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1190 | @@ -190,7 +190,7 @@ |
1191 | libkvistr_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1192 | |
1193 | libkvistr_la_SOURCES = libkvistr.cpp |
1194 | -libkvistr_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1195 | +libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1196 | subdir = src/modules/str |
1197 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1198 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1199 | diff -Nru kvirc-3.2.0.orig/src/modules/system/Makefile.am kvirc-3.2.0/src/modules/system/Makefile.am |
1200 | --- kvirc-3.2.0.orig/src/modules/system/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1201 | +++ kvirc-3.2.0/src/modules/system/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1202 | @@ -10,7 +10,7 @@ |
1203 | libkvisystem_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1204 | |
1205 | libkvisystem_la_SOURCES = libkvisystem.cpp |
1206 | -libkvisystem_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1207 | +libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1208 | |
1209 | # noinst_HEADERS= |
1210 | |
1211 | diff -Nru kvirc-3.2.0.orig/src/modules/system/Makefile.in kvirc-3.2.0/src/modules/system/Makefile.in |
1212 | --- kvirc-3.2.0.orig/src/modules/system/Makefile.in 2005-02-26 04:35:24.000000000 +0100 |
1213 | +++ kvirc-3.2.0/src/modules/system/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1214 | @@ -190,7 +190,7 @@ |
1215 | libkvisystem_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1216 | |
1217 | libkvisystem_la_SOURCES = libkvisystem.cpp |
1218 | -libkvisystem_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1219 | +libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1220 | subdir = src/modules/system |
1221 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1222 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1223 | diff -Nru kvirc-3.2.0.orig/src/modules/term/Makefile.am kvirc-3.2.0/src/modules/term/Makefile.am |
1224 | --- kvirc-3.2.0.orig/src/modules/term/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1225 | +++ kvirc-3.2.0/src/modules/term/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1226 | @@ -10,7 +10,7 @@ |
1227 | libkviterm_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1228 | |
1229 | libkviterm_la_SOURCES = libkviterm.cpp termwidget.cpp termwindow.cpp |
1230 | -libkviterm_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1231 | +libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1232 | |
1233 | noinst_HEADERS= termwidget.h termwindow.h |
1234 | |
1235 | diff -Nru kvirc-3.2.0.orig/src/modules/term/Makefile.in kvirc-3.2.0/src/modules/term/Makefile.in |
1236 | --- kvirc-3.2.0.orig/src/modules/term/Makefile.in 2005-02-26 04:35:25.000000000 +0100 |
1237 | +++ kvirc-3.2.0/src/modules/term/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1238 | @@ -190,7 +190,7 @@ |
1239 | libkviterm_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1240 | |
1241 | libkviterm_la_SOURCES = libkviterm.cpp termwidget.cpp termwindow.cpp |
1242 | -libkviterm_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1243 | +libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1244 | |
1245 | noinst_HEADERS = termwidget.h termwindow.h |
1246 | subdir = src/modules/term |
1247 | diff -Nru kvirc-3.2.0.orig/src/modules/tip/Makefile.am kvirc-3.2.0/src/modules/tip/Makefile.am |
1248 | --- kvirc-3.2.0.orig/src/modules/tip/Makefile.am 2005-02-12 22:13:31.000000000 +0100 |
1249 | +++ kvirc-3.2.0/src/modules/tip/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1250 | @@ -10,7 +10,7 @@ |
1251 | libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1252 | |
1253 | libkvitip_la_SOURCES = libkvitip.cpp |
1254 | -libkvitip_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1255 | +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1256 | |
1257 | noinst_HEADERS= libkvitip.h |
1258 | |
1259 | diff -Nru kvirc-3.2.0.orig/src/modules/tip/Makefile.in kvirc-3.2.0/src/modules/tip/Makefile.in |
1260 | --- kvirc-3.2.0.orig/src/modules/tip/Makefile.in 2005-02-26 04:35:25.000000000 +0100 |
1261 | +++ kvirc-3.2.0/src/modules/tip/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1262 | @@ -190,7 +190,7 @@ |
1263 | libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1264 | |
1265 | libkvitip_la_SOURCES = libkvitip.cpp |
1266 | -libkvitip_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1267 | +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1268 | |
1269 | noinst_HEADERS = libkvitip.h |
1270 | |
1271 | diff -Nru kvirc-3.2.0.orig/src/modules/tmphighlight/Makefile.am kvirc-3.2.0/src/modules/tmphighlight/Makefile.am |
1272 | --- kvirc-3.2.0.orig/src/modules/tmphighlight/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1273 | +++ kvirc-3.2.0/src/modules/tmphighlight/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1274 | @@ -13,7 +13,7 @@ |
1275 | libkvitmphighlight_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1276 | |
1277 | libkvitmphighlight_la_SOURCES = libkvitmphighlight.cpp |
1278 | -libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1279 | +libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1280 | |
1281 | |
1282 | #noinst_HEADERS= |
1283 | diff -Nru kvirc-3.2.0.orig/src/modules/tmphighlight/Makefile.in kvirc-3.2.0/src/modules/tmphighlight/Makefile.in |
1284 | --- kvirc-3.2.0.orig/src/modules/tmphighlight/Makefile.in 2005-02-26 04:35:26.000000000 +0100 |
1285 | +++ kvirc-3.2.0/src/modules/tmphighlight/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1286 | @@ -193,7 +193,7 @@ |
1287 | libkvitmphighlight_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1288 | |
1289 | libkvitmphighlight_la_SOURCES = libkvitmphighlight.cpp |
1290 | -libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1291 | +libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1292 | subdir = src/modules/tmphighlight |
1293 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1294 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1295 | diff -Nru kvirc-3.2.0.orig/src/modules/toolbar/Makefile.am kvirc-3.2.0/src/modules/toolbar/Makefile.am |
1296 | --- kvirc-3.2.0.orig/src/modules/toolbar/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1297 | +++ kvirc-3.2.0/src/modules/toolbar/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1298 | @@ -10,7 +10,7 @@ |
1299 | libkvitoolbar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1300 | |
1301 | libkvitoolbar_la_SOURCES = libkvitoolbar.cpp |
1302 | -libkvitoolbar_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1303 | +libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1304 | |
1305 | # noinst_HEADERS= |
1306 | |
1307 | diff -Nru kvirc-3.2.0.orig/src/modules/toolbar/Makefile.in kvirc-3.2.0/src/modules/toolbar/Makefile.in |
1308 | --- kvirc-3.2.0.orig/src/modules/toolbar/Makefile.in 2005-02-26 04:35:26.000000000 +0100 |
1309 | +++ kvirc-3.2.0/src/modules/toolbar/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1310 | @@ -190,7 +190,7 @@ |
1311 | libkvitoolbar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1312 | |
1313 | libkvitoolbar_la_SOURCES = libkvitoolbar.cpp |
1314 | -libkvitoolbar_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1315 | +libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1316 | subdir = src/modules/toolbar |
1317 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1318 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1319 | diff -Nru kvirc-3.2.0.orig/src/modules/toolbareditor/Makefile.am kvirc-3.2.0/src/modules/toolbareditor/Makefile.am |
1320 | --- kvirc-3.2.0.orig/src/modules/toolbareditor/Makefile.am 2005-01-25 03:22:48.000000000 +0100 |
1321 | +++ kvirc-3.2.0/src/modules/toolbareditor/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1322 | @@ -13,7 +13,7 @@ |
1323 | nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp |
1324 | |
1325 | noinst_HEADERS = toolbareditor.h |
1326 | -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1327 | +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1328 | |
1329 | moc_toolbareditor.cpp: toolbareditor.h |
1330 | $(SS_QT_MOC) $< -o $@ |
1331 | diff -Nru kvirc-3.2.0.orig/src/modules/toolbareditor/Makefile.in kvirc-3.2.0/src/modules/toolbareditor/Makefile.in |
1332 | --- kvirc-3.2.0.orig/src/modules/toolbareditor/Makefile.in 2005-02-26 04:35:26.000000000 +0100 |
1333 | +++ kvirc-3.2.0/src/modules/toolbareditor/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1334 | @@ -193,7 +193,7 @@ |
1335 | nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp |
1336 | |
1337 | noinst_HEADERS = toolbareditor.h |
1338 | -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1339 | +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1340 | subdir = src/modules/toolbareditor |
1341 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1342 | mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs |
1343 | diff -Nru kvirc-3.2.0.orig/src/modules/url/Makefile.am kvirc-3.2.0/src/modules/url/Makefile.am |
1344 | --- kvirc-3.2.0.orig/src/modules/url/Makefile.am 2003-12-18 04:00:47.000000000 +0100 |
1345 | +++ kvirc-3.2.0/src/modules/url/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1346 | @@ -12,7 +12,7 @@ |
1347 | libkviurl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1348 | |
1349 | libkviurl_la_SOURCES = libkviurl.cpp |
1350 | -libkviurl_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1351 | +libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1352 | |
1353 | |
1354 | noinst_HEADERS= libkviurl.h icons.h |
1355 | diff -Nru kvirc-3.2.0.orig/src/modules/url/Makefile.in kvirc-3.2.0/src/modules/url/Makefile.in |
1356 | --- kvirc-3.2.0.orig/src/modules/url/Makefile.in 2005-02-26 04:35:27.000000000 +0100 |
1357 | +++ kvirc-3.2.0/src/modules/url/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1358 | @@ -192,7 +192,7 @@ |
1359 | libkviurl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) |
1360 | |
1361 | libkviurl_la_SOURCES = libkviurl.cpp |
1362 | -libkviurl_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1363 | +libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1364 | |
1365 | noinst_HEADERS = libkviurl.h icons.h |
1366 | subdir = src/modules/url |
1367 | diff -Nru kvirc-3.2.0.orig/src/modules/window/Makefile.am kvirc-3.2.0/src/modules/window/Makefile.am |
1368 | --- kvirc-3.2.0.orig/src/modules/window/Makefile.am 2004-08-30 15:04:22.000000000 +0200 |
1369 | +++ kvirc-3.2.0/src/modules/window/Makefile.am 2005-03-07 16:50:18.000000000 +0100 |
1370 | @@ -13,7 +13,7 @@ |
1371 | |
1372 | libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp |
1373 | |
1374 | -libkviwindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1375 | +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1376 | |
1377 | noinst_HEADERS= userwindow.h |
1378 | |
1379 | diff -Nru kvirc-3.2.0.orig/src/modules/window/Makefile.in kvirc-3.2.0/src/modules/window/Makefile.in |
1380 | --- kvirc-3.2.0.orig/src/modules/window/Makefile.in 2005-02-26 04:35:27.000000000 +0100 |
1381 | +++ kvirc-3.2.0/src/modules/window/Makefile.in 2005-03-07 16:50:19.000000000 +0100 |
1382 | @@ -193,7 +193,7 @@ |
1383 | |
1384 | libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp |
1385 | |
1386 | -libkviwindow_la_LIBADD = $(SS_LIBLINK) -lkvilib |
1387 | +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la |
1388 | |
1389 | noinst_HEADERS = userwindow.h |
1390 | subdir = src/modules/window |