[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/11/13 17:31:03

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 

Log message:
        patch #7386

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1502&r2=1.1503

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- config/Makefile.in  7 Nov 2010 15:01:39 -0000       1.197
+++ config/Makefile.in  13 Nov 2010 17:31:02 -0000      1.198
@@ -1571,10 +1571,17 @@
 $(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/ocamlopt: 
$(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/Makefile
        cd $(LOCAL)/ocamlopt-$(REQUIRED_OCAML); $(MAKE)
 
-utils.byte: mld_hash.byte make_torrent.byte copysources.byte get_range.byte 
subconv.byte
-utils.opt: svg_converter mld_hash make_torrent copysources get_range subconv
-utils.opt.static: svg_converter mld_hash.static make_torrent.static 
copysources.static get_range.static subconv.static
-utils.byte.static: mld_hash.byte.static make_torrent.byte.static 
copysources.byte.static get_range.byte.static subconv.byte.static
+ifeq ("$(BITTORRENT)", "yes")
+MAKE_TORRENT=make_torrent
+MAKE_TORRENT_BYTE=$(MAKE_TORRENT).byte
+MAKE_TORRENT_STATIC=$(MAKE_TORRENT).static
+MAKE_TORRENT_BYTE_STATIC=$(MAKE_TORRENT_BYTE).static
+endif
+
+utils.byte: mld_hash.byte $(MAKE_TORRENT_BYTE) copysources.byte get_range.byte 
subconv.byte
+utils.opt: svg_converter mld_hash $(MAKE_TORRENT) copysources get_range subconv
+utils.opt.static: svg_converter mld_hash.static $(MAKE_TORRENT_STATIC) 
copysources.static get_range.static subconv.static
+utils.byte.static: mld_hash.byte.static $(MAKE_TORRENT_BYTE_STATIC) 
copysources.byte.static get_range.byte.static subconv.byte.static
 utils.static: 
        if test "$(TARGET_TYPE)" = "byte"; then \
                $(MAKE) utils.byte.static; \
@@ -1667,10 +1674,10 @@
        mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
        $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | 
sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
 
-release.utils.shared: mld_hash make_torrent
+release.utils.shared: mld_hash $(MAKE_TORRENT)
        rm -rf mldonkey-*
        mkdir -p $(DISDIR)
-       for i in "mld_hash make_torrent"; do \
+       for i in "mld_hash $(MAKE_TORRENT)"; do \
           cp -f $$i $(DISDIR)/$$i && \
           if [ "$(SYSTEM)" != "macos" ]; then \
             strip $(DISDIR)/$$i; \
@@ -1681,11 +1688,13 @@
        mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed 
"s/\//_/"`$(GLIBC_VERSION_ARCH).tar
        $(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
 
-release.utils.static: mld_hash.static make_torrent.static
+release.utils.static: mld_hash.static $(MAKE_TORRENT_STATIC)
        rm -rf mldonkey-*
        mkdir -p $(DISDIR)
        cp -f mld_hash.static $(DISDIR)/mld_hash && strip  $(DISDIR)/mld_hash
+ifeq ("$(BITTORRENT)", "yes")
        cp -f make_torrent.static $(DISDIR)/make_torrent && strip  
$(DISDIR)/make_torrent
+endif
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
        mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed 
"s/\//_/"`$(GLIBC_VERSION_ARCH).tar

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -b -r1.1502 -r1.1503
--- distrib/ChangeLog   7 Nov 2010 15:10:59 -0000       1.1502
+++ distrib/ChangeLog   13 Nov 2010 17:31:02 -0000      1.1503
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2010/11/13
+7386: Makefile: Do not compile make_torrent when BT support is disabled
+- fixes compile error during "make utils"
+
 2010/11/07
 7355: HTML: Fix URL enconding of commands (ygrek)
 7375: FileTP: fix submitting ftp download links (ygrek)