[llvm-commits] CVS: llvm/docs/Makefile
Changes in directory llvm/docs: Makefile updated: 1.14 -> 1.15 --- Log message: Fixing doxygen.cfg target. I'm not a makefile expert, so hopefully this correct.Tested doxygen generation on zion. --- Diffs of the changes: (+1 -1) Makefile |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm/docs/Makefile diff -u llvm/docs/Makefile:1.14 llvm/docs/Makefile:1.15 --- llvm/docs/Makefile:1.14 Tue Mar 27 01:06:15 2007 +++ llvm/docs/Makefile Tue Mar 27 18:19:39 2007 @@ -18,7 +18,7 @@ PACKAGE_VERSION = $(shell grep AC_INIT ../autoconf/configure.ac | sed -e 's/[^,]*,[[][[]//' -e 's/]],.*//') $(warning VERSION=$(VERSION)) -doxygen.cfg: doxygen.cfg.in +$(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in cat $< | sed \ -e 's/@abs_top_srcdir@/../g' \ -e 's/@DOT@/dot/g' \ ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/docs/Makefile
Changes in directory llvm/docs:
Makefile updated: 1.13 -> 1.14
---
Log message:
For PR1276: http://llvm.org/PR1276 :
Allow doxygen documentation to be rebuilt manually with "make regendoc"
separately from "make install".
Patch by Scott Michel.
---
Diffs of the changes: (+4 -2)
Makefile |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
Index: llvm/docs/Makefile
diff -u llvm/docs/Makefile:1.13 llvm/docs/Makefile:1.14
--- llvm/docs/Makefile:1.13 Sat Mar 3 18:45:50 2007
+++ llvm/docs/Makefile Tue Mar 27 01:06:15 2007
@@ -67,14 +67,16 @@
$(FIND) . -type f -exec \
$(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
-doxygen: $(PROJ_OBJ_DIR)/doxygen.tar.gz
+doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
-$(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFILES) $(PROJ_OBJ_DIR)/doxygen.cfg
+regendoc:
$(Echo) Building doxygen documentation
$(Verb) if test -e $(PROJ_OBJ_DIR)/doxygen ; then \
$(RM) -rf $(PROJ_OBJ_DIR)/doxygen ; \
fi
$(Verb) $(DOXYGEN) $(PROJ_OBJ_DIR)/doxygen.cfg
+
+$(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFILES) $(PROJ_OBJ_DIR)/doxygen.cfg
$(Echo) Packaging doxygen documentation
$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar
$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/docs/Makefile
Changes in directory llvm/docs: Makefile updated: 1.12 -> 1.13 --- Log message: Get the version number for the LLVM from the autoconf/configure.ac file when building the documentation for the web site. --- Diffs of the changes: (+9 -2) Makefile | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) Index: llvm/docs/Makefile diff -u llvm/docs/Makefile:1.12 llvm/docs/Makefile:1.13 --- llvm/docs/Makefile:1.12 Wed Jul 5 19:36:52 2006 +++ llvm/docs/Makefile Sat Mar 3 18:45:50 2007 @@ -13,10 +13,17 @@ ifdef BUILD_FOR_WEBSITE PROJ_OBJ_DIR = . DOXYGEN = doxygen +# Extract version number from the AC_INT line in configure.ac +# AC_INIT([[llvm]],[[2.0cvs]],[EMAIL PROTECTED]) +PACKAGE_VERSION = $(shell grep AC_INIT ../autoconf/configure.ac | sed -e 's/[^,]*,[[][[]//' -e 's/]],.*//') +$(warning VERSION=$(VERSION)) doxygen.cfg: doxygen.cfg.in - cat $< | sed 's/@abs_top_srcdir@/../g' | sed 's/@DOT@/dot/g' | \ -sed 's/@PACKAGE_VERSION@/CVS/g' | sed 's/@abs_top_builddir@/../g' > $@ + cat $< | sed \ + -e 's/@abs_top_srcdir@/../g' \ + -e 's/@DOT@/dot/g' \ + -e 's/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g' \ + -e 's/@abs_top_builddir@/../g' > $@ endif include $(LEVEL)/Makefile.common ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/docs/Makefile
Changes in directory llvm/docs: Makefile updated: 1.11 -> 1.12 --- Log message: The web site uses this --- Diffs of the changes: (+9 -0) Makefile |9 + 1 files changed, 9 insertions(+) Index: llvm/docs/Makefile diff -u llvm/docs/Makefile:1.11 llvm/docs/Makefile:1.12 --- llvm/docs/Makefile:1.11 Wed Nov 30 00:31:28 2005 +++ llvm/docs/Makefile Wed Jul 5 19:36:52 2006 @@ -10,6 +10,15 @@ LEVEL := .. DIRS := CommandGuide +ifdef BUILD_FOR_WEBSITE +PROJ_OBJ_DIR = . +DOXYGEN = doxygen + +doxygen.cfg: doxygen.cfg.in + cat $< | sed 's/@abs_top_srcdir@/../g' | sed 's/@DOT@/dot/g' | \ +sed 's/@PACKAGE_VERSION@/CVS/g' | sed 's/@abs_top_builddir@/../g' > $@ +endif + include $(LEVEL)/Makefile.common HTML := $(wildcard $(PROJ_SRC_DIR)/*.html) \ ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/docs/Makefile
Changes in directory llvm/docs: Makefile updated: 1.10 -> 1.11 --- Log message: copy the doxygen tarball into the HTML directory after building it --- Diffs of the changes: (+1 -0) Makefile |1 + 1 files changed, 1 insertion(+) Index: llvm/docs/Makefile diff -u llvm/docs/Makefile:1.10 llvm/docs/Makefile:1.11 --- llvm/docs/Makefile:1.10 Mon May 16 13:29:13 2005 +++ llvm/docs/Makefile Wed Nov 30 00:31:28 2005 @@ -63,6 +63,7 @@ $(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/doxygen.tar + $(Verb) $(CP) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_OBJ_DIR)/doxygen/html/ userloc: $(LLVM_SRC_ROOT)/docs/userloc.html ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
