[cfe-commits] r103222 - in /cfe/trunk/docs: AnalyzerRegions.html Block-ABI-Apple.txt BlockLanguageSpec.txt DriverArchitecture.png DriverInternals.html InternalsManual.html LanguageExtensions.html Makefile PCHInternals.html PCHLayout.graffle PCHLayout.png PTHInternals.html UsersManual.html api/ doxygen.cfg doxygen.cfg.in doxygen.css doxygen.footer doxygen.header doxygen.intro index.html libIndex.html main/ tools/Makefile

mike-m mikem.llvm at gmail.com
Thu May 6 17:42:33 PDT 2010


Author: mikem
Date: Thu May  6 19:42:33 2010
New Revision: 103222

URL: http://llvm.org/viewvc/llvm-project?rev=103222&view=rev
Log:
Reverted r103214.

Added:
    cfe/trunk/docs/AnalyzerRegions.html
      - copied unchanged from r103213, cfe/trunk/docs/AnalyzerRegions.html
    cfe/trunk/docs/Block-ABI-Apple.txt
      - copied unchanged from r103213, cfe/trunk/docs/Block-ABI-Apple.txt
    cfe/trunk/docs/BlockLanguageSpec.txt
      - copied unchanged from r103213, cfe/trunk/docs/BlockLanguageSpec.txt
    cfe/trunk/docs/DriverArchitecture.png
      - copied unchanged from r103213, cfe/trunk/docs/DriverArchitecture.png
    cfe/trunk/docs/DriverInternals.html
      - copied unchanged from r103213, cfe/trunk/docs/DriverInternals.html
    cfe/trunk/docs/InternalsManual.html
      - copied unchanged from r103213, cfe/trunk/docs/InternalsManual.html
    cfe/trunk/docs/LanguageExtensions.html
      - copied unchanged from r103213, cfe/trunk/docs/LanguageExtensions.html
    cfe/trunk/docs/PCHInternals.html
      - copied unchanged from r103213, cfe/trunk/docs/PCHInternals.html
    cfe/trunk/docs/PCHLayout.graffle
      - copied unchanged from r103213, cfe/trunk/docs/PCHLayout.graffle
    cfe/trunk/docs/PCHLayout.png
      - copied unchanged from r103213, cfe/trunk/docs/PCHLayout.png
    cfe/trunk/docs/PTHInternals.html
      - copied unchanged from r103213, cfe/trunk/docs/PTHInternals.html
    cfe/trunk/docs/UsersManual.html
      - copied unchanged from r103213, cfe/trunk/docs/UsersManual.html
    cfe/trunk/docs/doxygen.cfg
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.cfg
    cfe/trunk/docs/doxygen.cfg.in
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.cfg.in
    cfe/trunk/docs/doxygen.css
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.css
    cfe/trunk/docs/doxygen.footer
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.footer
    cfe/trunk/docs/doxygen.header
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.header
    cfe/trunk/docs/doxygen.intro
      - copied unchanged from r103213, cfe/trunk/docs/doxygen.intro
    cfe/trunk/docs/index.html
      - copied unchanged from r103213, cfe/trunk/docs/index.html
    cfe/trunk/docs/libIndex.html
      - copied unchanged from r103213, cfe/trunk/docs/libIndex.html
    cfe/trunk/docs/tools/Makefile
      - copied unchanged from r103213, cfe/trunk/docs/tools/Makefile
Removed:
    cfe/trunk/docs/api/
    cfe/trunk/docs/main/
Modified:
    cfe/trunk/docs/Makefile

Modified: cfe/trunk/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/Makefile?rev=103222&r1=103221&r2=103222&view=diff
==============================================================================
--- cfe/trunk/docs/Makefile (original)
+++ cfe/trunk/docs/Makefile Thu May  6 19:42:33 2010
@@ -7,7 +7,91 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL = ../../..
-DIRS  = main api
+LEVEL      := ../../..
+DIRS       := tools
+
+ifdef BUILD_FOR_WEBSITE
+PROJ_OBJ_DIR = .
+DOXYGEN = doxygen
+
+$(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in
+	cat $< | sed \
+	  -e 's/@abs_top_srcdir@/../g' \
+	  -e 's/@DOT@/dot/g' \
+	  -e 's/@PACKAGE_VERSION@/mainline/' \
+	  -e 's/@abs_top_builddir@/../g' > $@
+endif
 
 include $(LEVEL)/Makefile.common
+
+HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html) \
+              $(wildcard $(PROJ_SRC_DIR)/*.css)
+#IMAGES     := $(wildcard $(PROJ_SRC_DIR)/img/*.*)
+DOXYFILES  := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \
+              doxygen.intro
+EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide img
+
+.PHONY: install-html install-doxygen doxygen generated
+
+install_targets :=
+ifndef ONLY_MAN_DOCS
+install_targets += install-html
+endif
+ifeq ($(ENABLE_DOXYGEN),1)
+install_targets += install-doxygen
+endif
+install-local:: $(install_targets)
+
+# Live documentation is generated for the web site using this target:
+# 'make generated BUILD_FOR_WEBSITE=1'
+generated:: doxygen
+
+install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+	$(Echo) Installing HTML documentation
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+#	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+
+$(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+	$(Echo) Packaging HTML documentation
+	$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/html.tar
+	$(Verb) cd $(PROJ_SRC_DIR) && \
+	  $(TAR) cf $(PROJ_OBJ_DIR)/html.tar *.html
+	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/html.tar
+
+install-doxygen: doxygen
+	$(Echo) Installing doxygen documentation
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+	  $(FIND) . -type f -exec \
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+
+doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+
+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
+	$(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_SRC_ROOT)/docs/userloc.html:
+	$(Echo) Making User LOC Table
+	$(Verb) cd $(LLVM_SRC_ROOT) ; ./utils/userloc.pl -details -recurse \
+	  -html lib include tools runtime utils examples autoconf test > docs/userloc.html
+
+uninstall-local::
+	$(Echo) Uninstalling Documentation
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)





More information about the cfe-commits mailing list