summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorIntel <intel.com>2012-12-20 00:00:00 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2013-07-25 14:42:16 +0200
commit68bbafce3c3c98f7b5e75f778685e5cfd9b97ecc (patch)
tree466af90cdeb7e0b0a832a8a0c10e42fcd3080d1d /mk
parent4b2089fc9b83d26eba4be8f9371e6711cc90340d (diff)
downloaddpdk-68bbafce3c3c98f7b5e75f778685e5cfd9b97ecc.zip
dpdk-68bbafce3c3c98f7b5e75f778685e5cfd9b97ecc.tar.gz
dpdk-68bbafce3c3c98f7b5e75f778685e5cfd9b97ecc.tar.xz
doc: remove remaining references
Signed-off-by: Intel
Diffstat (limited to 'mk')
-rw-r--r--mk/internal/rte.exthelp-post.mk40
-rw-r--r--mk/rte.doc.mk6
-rw-r--r--mk/rte.extapp.mk1
-rw-r--r--mk/rte.extlib.mk1
-rw-r--r--mk/rte.extobj.mk1
-rw-r--r--mk/rte.sdkdoc.mk6
-rw-r--r--mk/rte.sdkroot.mk9
-rw-r--r--mk/rte.sdktestall.mk6
8 files changed, 4 insertions, 66 deletions
diff --git a/mk/internal/rte.exthelp-post.mk b/mk/internal/rte.exthelp-post.mk
deleted file mode 100644
index 04cad19..0000000
--- a/mk/internal/rte.exthelp-post.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# BSD LICENSE
-#
-# Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Intel Corporation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-HELP_FILE = $(RTE_SDK)/doc/rst/developpers_reference/app_mkhelp.rst
-
-help:
- @if [ ! -f $(HELP_FILE) ]; then \
- echo "Cannot find RTE SDK documentation" ; \
- exit 0 ; \
- fi
- @sed -e '1,/.*OF THE POSSIBILITY OF SUCH DAMAGE.*/ d' $(HELP_FILE)
diff --git a/mk/rte.doc.mk b/mk/rte.doc.mk
index cbde24b..5ce33a9 100644
--- a/mk/rte.doc.mk
+++ b/mk/rte.doc.mk
@@ -43,7 +43,6 @@ VPATH = $(abspath $(BASEDOCDIR)/$(DOCDIR))
pngfiles = $(patsubst %.svg,%.png,$(SVG))
pdfimgfiles = $(patsubst %.svg,%.pdf,$(SVG))
-htmlfiles = $(patsubst %.rst,%.html,$(RST))
pdffiles = $(patsubst %.rst,%.pdf,$(RST))
.PHONY: all doc clean
@@ -59,10 +58,7 @@ else
winpath = $(1)
endif
-all doc: $(pngfiles) $(htmlfiles) $(pdffiles) $(DIRS)
- @true
-
-htmldoc: $(pngfiles) $(htmlfiles) $(DIRS)
+all doc: $(pngfiles) $(pdffiles) $(DIRS)
@true
pdfdoc: $(pngfiles) $(pdffiles) $(DIRS)
diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk
index ec8bdc2..7372da9 100644
--- a/mk/rte.extapp.mk
+++ b/mk/rte.extapp.mk
@@ -52,4 +52,3 @@ else
include $(RTE_SDK)/mk/rte.app.mk
endif
-include $(RTE_SDK)/mk/internal/rte.exthelp-post.mk
diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk
index 4c21a4c..07fea7e 100644
--- a/mk/rte.extlib.mk
+++ b/mk/rte.extlib.mk
@@ -52,4 +52,3 @@ else
include $(RTE_SDK)/mk/rte.lib.mk
endif
-include $(RTE_SDK)/mk/internal/rte.exthelp-post.mk
diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk
index c84e03d..ea80f0f 100644
--- a/mk/rte.extobj.mk
+++ b/mk/rte.extobj.mk
@@ -52,4 +52,3 @@ else
include $(RTE_SDK)/mk/rte.obj.mk
endif
-include $(RTE_SDK)/mk/internal/rte.exthelp-post.mk
diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index f626fae..035f895 100644
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -57,16 +57,16 @@ pdfdoc:
doxydoc:
$(Q)$(MAKE) -C $(RTE_SDK)/doc/images $@ BASEDOCDIR=.. DOCDIR=images
$(Q)mkdir -p $(RTE_SDK)/doc/latex
- $(Q)mkdir -p $(RTE_SDK)/doc/pdf/api
$(Q)cat $(RTE_SDK)/doc/gen/doxygen_pdf/Doxyfile | doxygen -
$(Q)mv $(RTE_SDK)/doc/images/*.pdf $(RTE_SDK)/doc/latex/
$(Q)sed -i s/darkgray/headercolour/g $(RTE_SDK)/doc/latex/doxygen.sty
$(Q)cp $(RTE_SDK)/doc/gen/doxygen_pdf/Makefile_doxygen $(RTE_SDK)/doc/latex/Makefile
$(Q)$(MAKE) -C $(RTE_SDK)/doc/latex
- $(Q)cp $(RTE_SDK)/doc/latex/refman.pdf $(RTE_SDK)/doc/pdf/api/api.pdf
+ $(Q)mv $(RTE_SDK)/doc/latex/refman.pdf $(RTE_SDK)/doc/api_gen.pdf
+ $(Q)rm -rf $(RTE_SDK)/doc/latex
.PHONY: docclean
docclean:
$(Q)$(MAKE) -C $(RTE_SDK)/doc/images $@ BASEDOCDIR=.. DOCDIR=images
$(Q)$(MAKE) -f $(RTE_SDK)/doc/rst/Makefile -C $(RTE_SDK)/doc/pdf $@ BASEDOCDIR=.. DOCDIR=rst
- $(Q)rm -rf $(RTE_SDK)/doc/pdf/api $(RTE_SDK)/doc/latex
+ $(Q)rm -rf $(RTE_SDK)/doc/latex
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index f5cfb1f..bcf9fa5 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -102,10 +102,6 @@ fast_test ring_test mempool_test:
testall:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk testall
-.PHONY: testimport
-testimport:
- $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktestall.mk testimport
-
.PHONY: install
install:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk install
@@ -146,11 +142,6 @@ gcovclean:
gcov:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk gcov
-.PHONY: help
-help:
- @sed -e '1,/.*==================================.*/ d' \
- doc/rst/developers_reference/sdk_mkhelp.rst
-
# all other build targets
%:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig
diff --git a/mk/rte.sdktestall.mk b/mk/rte.sdktestall.mk
index 9ca0f80..a3ff2d4 100644
--- a/mk/rte.sdktestall.mk
+++ b/mk/rte.sdktestall.mk
@@ -56,9 +56,3 @@ testall: $(TESTALL_TARGETS)
%_testall:
@echo ================== Test $*
$(Q)$(MAKE) test O=$*
-
-#
-# import autotests in documentation
-#
-testimport:
- $(Q)$(RTE_SDK)/scripts/import_autotest.sh $(TESTALL_CONFIGS)