43 |
|
|
44 |
####################################################################### |
####################################################################### |
45 |
|
|
46 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
47 |
ICONS_CHOICE=icons/rsvg |
ICONS_CHOICE=icons/rsvg |
48 |
SRC_GUI=src/gtk2/gui |
SRC_GUI=src/gtk2/gui |
49 |
GUI=GTK2GUI |
GUI_CODE=GTK2GUI |
50 |
IM_GUI=src/gtk2/im |
IM_GUI=src/gtk2/im |
51 |
CHAT_GUI=src/gtk2/chat |
CHAT_GUI=src/gtk2/chat |
52 |
|
GTK=gtk2 |
53 |
else |
else |
54 |
CONFIGWIN=src/gtk/configwin |
CONFIGWIN=src/gtk/configwin |
55 |
GPATTERN=src/gtk/gpattern |
GPATTERN=src/gtk/gpattern |
56 |
OKEY=src/gtk/okey |
OKEY=src/gtk/okey |
57 |
IM_GUI=src/im |
IM_GUI=src/im |
58 |
CHAT_GUI=src/gtk/chat |
CHAT_GUI=src/gtk/chat |
59 |
ifeq ("$(BUILD_NEWGUI)", "yes") |
GTK=gtk |
60 |
|
ifeq ("$(GUI)", "newgui1") |
61 |
SRC_PROGRESS=src/gtk/progress |
SRC_PROGRESS=src/gtk/progress |
62 |
ICONS_CHOICE=icons/tux |
ICONS_CHOICE=icons/tux |
63 |
GUI=NEWGUI |
GUI_CODE=NEWGUI |
64 |
SRC_GUI=src/gtk/newgui |
SRC_GUI=src/gtk/newgui |
65 |
else |
else |
66 |
SRC_GUI=src/gtk/gui |
SRC_GUI=src/gtk/gui |
67 |
ICONS_CHOICE=icons/kde |
ICONS_CHOICE=icons/kde |
68 |
GUI=OLDGUI |
GUI_CODE=OLDGUI |
69 |
endif |
endif |
70 |
endif |
endif |
71 |
|
|
577 |
MLNET_CMXA=cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa |
MLNET_CMXA=cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa |
578 |
MLNET_SRCS= $(MAIN_SRCS) |
MLNET_SRCS= $(MAIN_SRCS) |
579 |
|
|
580 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
581 |
mlnet+gui_CMXA= \ |
mlnet+gui_CMXA= \ |
582 |
cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa \ |
cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa \ |
583 |
icons.cmxa guibase.cmxa gui.cmxa |
icons.cmxa guibase.cmxa gui.cmxa |
810 |
fi |
fi |
811 |
|
|
812 |
|
|
813 |
ifeq ("$(COMPILE_GUI)" , "yes") |
ifneq ("$(GUI)" , "no") |
814 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
815 |
SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 |
SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 |
816 |
GTK_LIBS_byte=-I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma |
GTK_LIBS_byte=-I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma |
817 |
GTK_LIBS_opt=-I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
GTK_LIBS_opt=-I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
1140 |
icons/small/trash_small.xpm icons/small/verify_chunks_small.xpm \ |
icons/small/trash_small.xpm icons/small/verify_chunks_small.xpm \ |
1141 |
icons/small/view_users_small.xpm |
icons/small/view_users_small.xpm |
1142 |
|
|
1143 |
ICONS= $($(GUI)_ICONS) |
ICONS= $($(GUI_CODE)_ICONS) |
1144 |
SMALL_ICONS= $($(GUI)_SMALL_ICONS) |
SMALL_ICONS= $($(GUI_CODE)_SMALL_ICONS) |
1145 |
|
|
1146 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1147 |
ALL_ICONS=$(foreach file, $(ICONS), $(basename $(file)).ml_icons) |
ALL_ICONS=$(foreach file, $(ICONS), $(basename $(file)).ml_icons) |
1148 |
ALL_ICONS_SRCS=$(foreach file, $(ICONS), $(basename $(file))_svg.ml) |
ALL_ICONS_SRCS=$(foreach file, $(ICONS), $(basename $(file))_svg.ml) |
1149 |
else |
else |
1153 |
|
|
1154 |
$(ALL_ICONS_SRCS): $(ALL_ICONS) |
$(ALL_ICONS_SRCS): $(ALL_ICONS) |
1155 |
|
|
1156 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1157 |
GUI_BASE_SRCS= \ |
GUI_BASE_SRCS= \ |
1158 |
$(SRC_GUI)/guiUtf8.ml $(SRC_GUI)/guiMessages.ml \ |
$(SRC_GUI)/guiUtf8.ml $(SRC_GUI)/guiMessages.ml \ |
1159 |
$(SRC_GUI)/guiColumns.ml $(SRC_GUI)/guiOptions.ml \ |
$(SRC_GUI)/guiColumns.ml $(SRC_GUI)/guiOptions.ml \ |
1244 |
$(SRC_GUI)/gui_config.ml \ |
$(SRC_GUI)/gui_config.ml \ |
1245 |
$(SRC_GUI)/gui_main.ml |
$(SRC_GUI)/gui_main.ml |
1246 |
|
|
1247 |
GUI_SRCS= $($(GUI)_SRCS) |
GUI_SRCS= $($(GUI_CODE)_SRCS) |
1248 |
|
|
1249 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1250 |
MLDONKEYGUI_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa gui.cmxa |
MLDONKEYGUI_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa gui.cmxa |
1251 |
else |
else |
1252 |
MLDONKEYGUI_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa gui.cmxa |
MLDONKEYGUI_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa gui.cmxa |
1254 |
|
|
1255 |
MLDONKEYGUI_SRCS= $(MAIN_SRCS) |
MLDONKEYGUI_SRCS= $(MAIN_SRCS) |
1256 |
|
|
1257 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1258 |
MLDONKEY_IM_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
MLDONKEY_IM_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
1259 |
else |
else |
1260 |
MLDONKEY_IM_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa |
MLDONKEY_IM_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa |
1261 |
endif |
endif |
1262 |
|
|
1263 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1264 |
MLDONKEY_IM_SRCS= $(IM_GUI_CORE) $(IM_GUI)/guiImMain.ml $(MAIN_SRCS) |
MLDONKEY_IM_SRCS= $(IM_GUI_CORE) $(IM_GUI)/guiImMain.ml $(MAIN_SRCS) |
1265 |
else |
else |
1266 |
MLDONKEY_IM_SRCS= $(IM_GUI_CORE) $(IM_GUI)/gui_im_main.ml $(MAIN_SRCS) |
MLDONKEY_IM_SRCS= $(IM_GUI_CORE) $(IM_GUI)/gui_im_main.ml $(MAIN_SRCS) |
1267 |
endif |
endif |
1268 |
|
|
1269 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1270 |
STARTER_CMXA=cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
STARTER_CMXA=cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
1271 |
STARTER_SRCS= $(SRC_GUI)/guiStarter.ml |
STARTER_SRCS= $(SRC_GUI)/guiStarter.ml |
1272 |
else |
else |
1274 |
STARTER_SRCS= $(SRC_GUI)/gui_starter.ml |
STARTER_SRCS= $(SRC_GUI)/gui_starter.ml |
1275 |
endif |
endif |
1276 |
|
|
1277 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1278 |
INSTALLER_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
INSTALLER_CMXA= cdk.cmxa common.cmxa icons.cmxa guibase.cmxa |
1279 |
else |
else |
1280 |
INSTALLER_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa |
INSTALLER_CMXA= cdk.cmxa gmisc.cmxa common.cmxa icons.cmxa guibase.cmxa |
1281 |
endif |
endif |
1282 |
|
|
1283 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1284 |
INSTALLER_SRCS= \ |
INSTALLER_SRCS= \ |
1285 |
$(SRC_GUI)/gui_installer_base.ml $(SRC_GUI)/gui_installer.ml |
$(SRC_GUI)/gui_installer_base.ml $(SRC_GUI)/gui_installer.ml |
1286 |
else |
else |
1304 |
$(CHAT)/chat_data.ml \ |
$(CHAT)/chat_data.ml \ |
1305 |
$(CHAT)/chat_args.ml |
$(CHAT)/chat_args.ml |
1306 |
|
|
1307 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1308 |
CHAT_EXE_SRCS += $(CHAT_GUI)/chat_art.ml $(CHAT_GUI)/chat_configwin.ml |
CHAT_EXE_SRCS += $(CHAT_GUI)/chat_art.ml $(CHAT_GUI)/chat_configwin.ml |
1309 |
endif |
endif |
1310 |
|
|
1316 |
$(CHAT)/mlchat.ml \ |
$(CHAT)/mlchat.ml \ |
1317 |
$(CHAT_GUI)/chat_main.ml |
$(CHAT_GUI)/chat_main.ml |
1318 |
|
|
1319 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1320 |
MLCHAT_CMXA= cdk.cmxa icons.cmxa |
MLCHAT_CMXA= cdk.cmxa icons.cmxa |
1321 |
else |
else |
1322 |
MLCHAT_CMXA= cdk.cmxa gmisc.cmxa |
MLCHAT_CMXA= cdk.cmxa gmisc.cmxa |
1326 |
|
|
1327 |
|
|
1328 |
TARGETS += mlgui$(EXE) mlchat$(EXE) mlguistarter$(EXE) |
TARGETS += mlgui$(EXE) mlchat$(EXE) mlguistarter$(EXE) |
1329 |
ifeq ("$(BUILD_NEWGUI)", "yes") |
ifeq ("$(GUI)", "newgui") |
1330 |
TARGETS += mlprogress$(EXE) |
TARGETS += mlprogress$(EXE) |
1331 |
endif |
endif |
1332 |
|
|
1344 |
|
|
1345 |
IM_CORE += $(IM)/irc/irc.ml |
IM_CORE += $(IM)/irc/irc.ml |
1346 |
|
|
1347 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1348 |
IM_GUI_CORE += $(IM_GUI)/guiImAccounts.ml $(IM_GUI)/guiImChat.ml \ |
IM_GUI_CORE += $(IM_GUI)/guiImAccounts.ml $(IM_GUI)/guiImChat.ml \ |
1349 |
$(IM_GUI)/guiImRooms.ml $(IM_GUI)/guiIm.ml |
$(IM_GUI)/guiImRooms.ml $(IM_GUI)/guiIm.ml |
1350 |
else |
else |
1407 |
|
|
1408 |
## TARGETS += $1$(EXE) |
## TARGETS += $1$(EXE) |
1409 |
|
|
1410 |
ifeq ("$(COMPILE_GUI)" , "yes") |
ifneq ("$(GUI)" , "no") |
1411 |
|
|
1412 |
## BUNDLE_TARGETS += $1+gui$(EXE) |
## BUNDLE_TARGETS += $1+gui$(EXE) |
1413 |
|
|
1420 |
|
|
1421 |
EXPAND_LIB($2,$1) |
EXPAND_LIB($2,$1) |
1422 |
|
|
1423 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1424 |
$1+gui_CMXA=cdk.cmxa \ |
$1+gui_CMXA=cdk.cmxa \ |
1425 |
common.cmxa client.cmxa $1.cmxa driver.cmxa \ |
common.cmxa client.cmxa $1.cmxa driver.cmxa \ |
1426 |
gmisc.cmxa icons.cmxa guibase.cmxa gui.cmxa |
gmisc.cmxa icons.cmxa guibase.cmxa gui.cmxa |
1447 |
libcdk_SRCS= $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) $(MP3TAG_SRCS) |
libcdk_SRCS= $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) $(MP3TAG_SRCS) |
1448 |
libcommon_SRCS= $(CHAT_SRCS) $(COMMON_SRCS) |
libcommon_SRCS= $(CHAT_SRCS) $(COMMON_SRCS) |
1449 |
libclient_SRCS= $(COMMON_CLIENT_SRCS) |
libclient_SRCS= $(COMMON_CLIENT_SRCS) |
1450 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(GUI)", "newgui2") |
1451 |
libgmisc_SRCS= |
libgmisc_SRCS= |
1452 |
else |
else |
1453 |
libgmisc_SRCS= $(CONFIGWIN_SRCS) $(MP3TAGUI_SRCS) $(OKEY_SRCS) $(GPATTERN_SRCS) |
libgmisc_SRCS= $(CONFIGWIN_SRCS) $(MP3TAGUI_SRCS) $(OKEY_SRCS) $(GPATTERN_SRCS) |
1464 |
EXPAND_LIB(DRIVER,driver) |
EXPAND_LIB(DRIVER,driver) |
1465 |
EXPAND_LIB(CORE,core) |
EXPAND_LIB(CORE,core) |
1466 |
|
|
1467 |
ifneq ("$(USE_GTK2)", "yes") |
ifneq ("$(GUI)", "newgui2") |
1468 |
EXPAND_LIB(libgmisc,gmisc) |
EXPAND_LIB(libgmisc,gmisc) |
1469 |
endif |
endif |
1470 |
|
|
1529 |
EXPAND(MLPROGRESS, mlprogress,GTK, MLPROGRESS) |
EXPAND(MLPROGRESS, mlprogress,GTK, MLPROGRESS) |
1530 |
EXPAND(MLDONKEYGUI,mlgui,GTK,MLDONKEYGUI) |
EXPAND(MLDONKEYGUI,mlgui,GTK,MLDONKEYGUI) |
1531 |
|
|
1532 |
ifneq ("$(BUILD_NEWGUI)", "yes") |
ifeq ("$(GUI)", "oldgui") |
1533 |
ifneq ("$(USE_GTK2)", "yes") |
EXPAND(MLDONKEYGUI2,mlgui2,GTK,MLDONKEYGUI2) |
|
EXPAND(MLDONKEYGUI2,mlgui2,GTK,MLDONKEYGUI2) |
|
|
endif |
|
1534 |
endif |
endif |
1535 |
|
|
1536 |
EXPAND(mldc,mldc,NO,mldc) |
EXPAND(mldc,mldc,NO,mldc) |
1647 |
|
|
1648 |
|
|
1649 |
zogml: |
zogml: |
1650 |
(for i in $(GUI)/gui*_base.zog ; do \ |
(for i in $(GUI_CODE)/gui*_base.zog ; do \ |
1651 |
$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i > $(GUI)/`basename $$i zog`ml ;\ |
$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i > $(GUI_CODE)/`basename $$i zog`ml ;\ |
1652 |
done) |
done) |
1653 |
|
|
1654 |
####################################################################### |
####################################################################### |
1710 |
rm -rf *.tar.bz2 |
rm -rf *.tar.bz2 |
1711 |
|
|
1712 |
maintainerclean: distclean |
maintainerclean: distclean |
1713 |
echo rm -f $(GUI)/gui.ml $(GUI)/gui_zog.ml |
echo rm -f $(GUI_CODE)/gui.ml $(GUI_CODE)/gui_zog.ml |
1714 |
rm -f config/configure |
rm -f config/configure |
1715 |
rm -f packages/rpm/Makefile |
rm -f packages/rpm/Makefile |
1716 |
rm -f Makefile |
rm -f Makefile |
1742 |
$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli >> .depend; \ |
$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli >> .depend; \ |
1743 |
$(OCAMLPP) $$i/*.mlt >> .depend; \ |
$(OCAMLPP) $$i/*.mlt >> .depend; \ |
1744 |
done) |
done) |
1745 |
if test "$(COMPILE_GUI)" = "yes"; then \ |
if test "$(GUI)" = "newgui2"; then \ |
1746 |
if test "$(USE_GTK2)" = "yes"; then \ |
$(MAKE) svg_converter; \ |
|
$(MAKE) svg_converter; \ |
|
|
fi; \ |
|
1747 |
fi |
fi |
1748 |
|
|
1749 |
$(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/Makefile: patches/ocamlopt-$(REQUIRED_OCAML).tar.gz |
$(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/Makefile: patches/ocamlopt-$(REQUIRED_OCAML).tar.gz |
1767 |
####################################################################### |
####################################################################### |
1768 |
|
|
1769 |
DISDIR=mldonkey-distrib |
DISDIR=mldonkey-distrib |
1770 |
#distrib/Readme.txt: $(GUI)/gui_messages.ml |
#distrib/Readme.txt: $(GUI_CODE)/gui_messages.ml |
1771 |
# grep -A 1000 help_text $(GUI)/gui_messages.ml | grep -v '"' > distrib/Readme.txt |
# grep -A 1000 help_text $(GUI_CODE)/gui_messages.ml | grep -v '"' > distrib/Readme.txt |
1772 |
|
|
1773 |
|
|
1774 |
debug: |
debug: |
1778 |
|
|
1779 |
RELEASE_TARGETS=mlnet |
RELEASE_TARGETS=mlnet |
1780 |
|
|
1781 |
ifeq ("$(COMPILE_GUI)" , "yes") |
ifneq ("$(GUI)" , "no") |
1782 |
RELEASE_TARGETS += mlgui mlnet+gui mlguistarter mlchat |
RELEASE_TARGETS += mlgui mlnet+gui mlguistarter mlchat |
1783 |
endif |
endif |
1784 |
|
|