Lines 19-24
Link Here
|
19 |
-L../thotlib -L.. -lThotEditor \ |
19 |
-L../thotlib -L.. -lThotEditor \ |
20 |
$(AMAYA_OPTION_EXTRA_LIBS) $(EXPAT_LIBRARIES) \ |
20 |
$(AMAYA_OPTION_EXTRA_LIBS) $(EXPAT_LIBRARIES) \ |
21 |
$(AMAYA_LIBWWW_LIBS) \ |
21 |
$(AMAYA_LIBWWW_LIBS) \ |
|
|
22 |
@AMAYA_LIBWWW_LIBS@ $(WWWDAV) \ |
22 |
$(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ |
23 |
$(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ |
23 |
@AMAYA_RAPTOR_LIBS@ \ |
24 |
@AMAYA_RAPTOR_LIBS@ \ |
24 |
$(WX_LIBRARIES) |
25 |
$(WX_LIBRARIES) |
Lines 124-130
Link Here
|
124 |
AMAYA_OPTION_INCLUDES= \ |
125 |
AMAYA_OPTION_INCLUDES= \ |
125 |
$(AMAYA_LIBWWW_INCLUDES) $(AMAYA_MATH_INCLUDES) \ |
126 |
$(AMAYA_LIBWWW_INCLUDES) $(AMAYA_MATH_INCLUDES) \ |
126 |
$(AMAYA_SVG_INCLUDES) $(AMAYA_ANNOT_INCLUDES) \ |
127 |
$(AMAYA_SVG_INCLUDES) $(AMAYA_ANNOT_INCLUDES) \ |
127 |
$(AMAYA_DAV_INCLUDES) $(AMAYA_TEMPLATES_INCLUDES) |
128 |
$(AMAYA_DAV_INCLUDES) $(AMAYA_TEMPLATES_INCLUDES) @AMAYA_LIBWWW_INCLUDES@ |
128 |
|
129 |
|
129 |
AMAYA_OPTION_OBJ= \ |
130 |
AMAYA_OPTION_OBJ= \ |
130 |
$(AMAYA_LIBWWW_OBJ) $(AMAYA_SVG_OBJ) $(AMAYA_MATH_OBJ) \ |
131 |
$(AMAYA_LIBWWW_OBJ) $(AMAYA_SVG_OBJ) $(AMAYA_MATH_OBJ) \ |
Lines 138-144
Link Here
|
138 |
|
139 |
|
139 |
AMAYA_OPTION_LIBS= \ |
140 |
AMAYA_OPTION_LIBS= \ |
140 |
$(AMAYA_LIBWWW_OPTION_LIBS) $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \ |
141 |
$(AMAYA_LIBWWW_OPTION_LIBS) $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \ |
141 |
$(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) @AMAYA_RAPTOR_LIBS@ |
142 |
$(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) @AMAYA_RAPTOR_LIBS@ |
142 |
|
143 |
|
143 |
AMAYA_OPTION_EXTRA_LIBS= \ |
144 |
AMAYA_OPTION_EXTRA_LIBS= \ |
144 |
$(AMAYA_LIBWWW_EXTRA_LIBS) $(AMAYA_MATH_EXTRA_LIBS) \ |
145 |
$(AMAYA_LIBWWW_EXTRA_LIBS) $(AMAYA_MATH_EXTRA_LIBS) \ |
Lines 195-205
Link Here
|
195 |
$(RANLIB) libCSS.a |
196 |
$(RANLIB) libCSS.a |
196 |
|
197 |
|
197 |
AMAYA_OBJ = \ |
198 |
AMAYA_OBJ = \ |
|
|
199 |
query.o \ |
200 |
AHTInit.o \ |
201 |
answer.o \ |
202 |
AHTBridge.o \ |
203 |
AHTFWrite.o \ |
204 |
AHTMemConv.o \ |
198 |
wxdialog/AuthentDlgWX.o \ |
205 |
wxdialog/AuthentDlgWX.o \ |
199 |
wxdialog/CheckedListDlgWX.o \ |
206 |
wxdialog/CheckedListDlgWX.o \ |
200 |
wxdialog/CreateTableDlgWX.o \ |
207 |
wxdialog/CreateTableDlgWX.o \ |
201 |
wxdialog/DocInfoDlgWX.o \ |
208 |
wxdialog/DocInfoDlgWX.o \ |
202 |
wxdialog/FontDlgWX.o \ |
209 |
wxdialog/FontDlgWX.o \ |
203 |
wxdialog/HRefDlgWX.o \ |
210 |
wxdialog/HRefDlgWX.o \ |
204 |
wxdialog/ImageDlgWX.o \ |
211 |
wxdialog/ImageDlgWX.o \ |
205 |
wxdialog/InitConfirmDlgWX.o \ |
212 |
wxdialog/InitConfirmDlgWX.o \ |
Lines 219-225
Link Here
|
219 |
wxdialog/SpellCheckDlgWX.o \ |
226 |
wxdialog/SpellCheckDlgWX.o \ |
220 |
wxdialog/SendByMailDlgWX.o \ |
227 |
wxdialog/SendByMailDlgWX.o \ |
221 |
wxdialog/StyleDlgWX.o \ |
228 |
wxdialog/StyleDlgWX.o \ |
222 |
wxdialog/StyleListToolPanel.o \ |
229 |
wxdialog/StyleListToolPanel.o \ |
223 |
wxdialog/TitleDlgWX.o \ |
230 |
wxdialog/TitleDlgWX.o \ |
224 |
wxdialogapi.o \ |
231 |
wxdialogapi.o \ |
225 |
EDITORAPP.o \ |
232 |
EDITORAPP.o \ |