mempool: fix alignment of memzone length when populating

[dpdk.git] / mk / rte.sdkdoc.mk

diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index fb8f915..bce57c5 100644 (file)
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -73,7 +73,7 @@ api-html: $(API_EXAMPLES)
        $(Q)mkdir -p $(RTE_OUTPUT)/doc/html
        $(Q)(cat $(RTE_SDK)/doc/api/doxy-api.conf     && \
            printf 'PROJECT_NUMBER = '                && \
-                             $(MAKE) -rR showversion && \
+                            $(MAKE) -rRs showversion && \
            echo INPUT           += $(API_EXAMPLES)   && \
            echo OUTPUT_DIRECTORY = $(RTE_OUTPUT)/doc && \
            echo HTML_OUTPUT      = html/api          && \
@@ -93,7 +93,7 @@ $(API_EXAMPLES): api-html-clean
        $(Q)mkdir -p $(@D)
        @printf '/**\n' > $(API_EXAMPLES)
        @printf '@page examples DPDK Example Programs\n\n' >> $(API_EXAMPLES)
-       @find examples -type f -name '*.c' -printf '@example %p\n' >> $(API_EXAMPLES)
+       @find examples -type f -name '*.c' -printf '@example %p\n' | LC_ALL=C sort >> $(API_EXAMPLES)
        @printf '*/\n' >> $(API_EXAMPLES)
 
 guides-pdf-clean: guides-pdf-img-clean
@@ -117,7 +117,13 @@ guides-pdf-%:
        $(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \
                $(RTE_OUTPUT)/doc/pdf/guides/$*.pdf
 
-guides-%:
+guides-html-prepare:
+       $(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \
+               $(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css
+
+guides-%-prepare: ;
+
+guides-%: guides-%-prepare
        @echo 'sphinx processing $@...'
        $(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \
                -c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \