[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef... |
Date: |
Sun, 18 Dec 2005 16:51:32 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 05/12/18 16:51:32
Modified files:
config : Makefile.config.in Makefile.in configure.in
distrib : ChangeLog
Log message:
patch #4723
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.config.in.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.138&tr2=1.139&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.238&tr2=1.239&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.628&tr2=1.629&r1=text&r2=text
Patches:
Index: mldonkey/config/Makefile.config.in
diff -u mldonkey/config/Makefile.config.in:1.53
mldonkey/config/Makefile.config.in:1.54
--- mldonkey/config/Makefile.config.in:1.53 Wed Nov 30 23:46:24 2005
+++ mldonkey/config/Makefile.config.in Sun Dec 18 16:51:32 2005
@@ -15,6 +15,7 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.138 mldonkey/config/Makefile.in:1.139
--- mldonkey/config/Makefile.in:1.138 Sat Dec 17 21:15:45 2005
+++ mldonkey/config/Makefile.in Sun Dec 18 16:51:32 2005
@@ -1370,6 +1370,7 @@
$1_MLT := $(filter %.mlt, $($1_SRCS))
$1_MLP := $(filter %.mlcpp, $($1_SRCS))
$1_ML := $(filter %.ml %.mll %.zog %.mly %.ml4 %.mlt %.mlcpp, $($1_SRCS))
+$1_DOC := $(filter %.ml %.mll %.zog %.mly %.ml4 %.mlcpp, $($1_SRCS))
$1_C := $(filter %.c %.cc, $($1_SRCS))
$1_CMOS=$(foreach file, $($1_ML), $(basename $(file)).cmo)
$1_CMXS=$(foreach file, $($1_ML), $(basename $(file)).cmx)
@@ -1602,6 +1603,12 @@
static: $(foreach target, $(TARGETS), $(target).static)
+ocamldoc: ocamldoc_html
+
+ocamldoc_html: $(CORE_DOC) $(libclient_DOC)
+ mkdir -p ocamldoc
+ $(OCAMLDOC) -sort -dump ocamldoc/ocamldocdump -html -d ocamldoc
$(INCLUDES) $(libclient_DOC) $(CORE_DOC)
+
kde_applet: $(APPLET_OBJS)
cd src/applets/kde; ./configure --prefix /usr; make
@echo; echo
@@ -1699,6 +1706,7 @@
rm -f icons/rsvg/*.ml_icons
rm -f icons/rsvg/*.ml
rm -f tools/zoggy/*.cm?
+ rm -rf ocamldoc
rm -rf mldonkey-distrib*
rm -f mldonkey-$(CURRENT_VERSION).*
@@ -1712,7 +1720,7 @@
rm -f config/configure
rm -f Makefile
-.PHONY: TAGS clean tmpclean moreclean releaseclean distclean maintainerclean
+.PHONY: TAGS clean tmpclean moreclean releaseclean distclean maintainerclean
ocamldoc_html
LOCAL=patches/build
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.238 mldonkey/config/configure.in:1.239
--- mldonkey/config/configure.in:1.238 Sat Dec 10 19:44:28 2005
+++ mldonkey/config/configure.in Sun Dec 18 16:51:32 2005
@@ -465,6 +465,7 @@
if test "$OCAMLC" = "$LOCAL_OCAML"/ocamlc.opt ; then
OCAML_PATH="$LOCAL_OCAML"/
OCAMLOPT=$LOCAL_OCAML/ocamlopt.opt
+ OCAMLDOC=$LOCAL_OCAML/ocamldoc
OCAMLMKTOP=$LOCAL_OCAML/ocamlmktop
OCAMLDEP=$LOCAL_OCAML/ocamldep
OCAMLLEX=$LOCAL_OCAML/ocamllex.opt
@@ -478,6 +479,7 @@
else
OCAMLOPT=no
fi
+ OCAMLDOC=$LOCAL_OCAML/ocamldoc
OCAMLMKTOP=$LOCAL_OCAML/ocamlmktop
OCAMLDEP=$LOCAL_OCAML/ocamldep
OCAMLLEX=$LOCAL_OCAML/ocamllex
@@ -490,6 +492,7 @@
AC_CHECK_PROG(OCAMLLEX, ocamllex.opt, ocamllex.opt)
AC_CHECK_PROG(OCAMLLEX, ocamllex, ocamllex)
AC_CHECK_PROG(OCAMLYACC, ocamlyacc, ocamlyacc)
+ AC_CHECK_PROG(OCAMLDOC, ocamldoc, ocamldoc)
AC_CHECK_PROG(OCAMLMKTOP, ocamlmktop, ocamlmktop)
AC_CHECK_PROG(CAMLP4, camlp4, camlp4)
fi
@@ -1125,6 +1128,7 @@
AC_SUBST(OCAMLDEP_OPTIONS)
AC_SUBST(CAMLP4)
AC_SUBST(PERL)
+AC_SUBST(OCAMLDOC)
AC_SUBST(OCAMLMKTOP)
AC_SUBST(SYSTEM)
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.628 mldonkey/distrib/ChangeLog:1.629
--- mldonkey/distrib/ChangeLog:1.628 Sun Dec 18 14:50:38 2005
+++ mldonkey/distrib/ChangeLog Sun Dec 18 16:51:32 2005
@@ -12,6 +12,7 @@
http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
2005/12/18
+4723: New build target: make ocamldoc (pango)
4721: Log: Improve output for verbosity "verb", remove verbosity "hid"
2005/12/17
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...,
mldonkey-commits <=