From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> It is easy to update PREDEFINED definitions in one Doxyfile, while forgetting about the others, as happened e.g. with ODP_DEPRECATE(x) definition. Move PREDEFINED definitions into Doxyfile_common, so that it is included by the rest of Doxyfiles.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> --- /** Email created from pull request 74 (lumag:crypto-packet) ** https://github.com/Linaro/odp/pull/74 ** Patch: https://github.com/Linaro/odp/pull/74.patch ** Base sha: ee5be324411a7520528a367967c28fc529d3bc2e ** Merge commit sha: 5411462e6545fa2d6a286a40c2057db97714ee74 **/ doc/Doxyfile_common | 12 ++++++++++++ doc/application-api-guide/Doxyfile | 2 -- doc/driver-api-guide/Doxyfile | 8 -------- doc/helper-guide/Doxyfile | 8 -------- doc/platform-api-guide/Doxyfile | 9 --------- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/doc/Doxyfile_common b/doc/Doxyfile_common index 59558535..0471dcf3 100644 --- a/doc/Doxyfile_common +++ b/doc/Doxyfile_common @@ -30,3 +30,15 @@ MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg +PREDEFINED = __GNUC__ \ + __attribute__(x)= \ + ODP_ALIGNED(x)= \ + ODPDRV_ALIGNED(x)= \ + __BIG_ENDIAN_BITFIELD \ + __LITTLE_ENDIAN_BITFIELD \ + __x86_64__ \ + ODP_PACKED \ + ODPDRV_PACKED \ + ODP_DEPRECATE(x)=x \ + "ODP_HANDLE_T(type)=odp_handle_t type" \ + "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" diff --git a/doc/application-api-guide/Doxyfile b/doc/application-api-guide/Doxyfile index 9cb183c1..2709f6fd 100644 --- a/doc/application-api-guide/Doxyfile +++ b/doc/application-api-guide/Doxyfile @@ -7,6 +7,4 @@ INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/include EXCLUDE_PATTERNS = drv* odp_drv.h EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" WARNINGS = NO diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile index b5f7260e..28794ef0 100644 --- a/doc/driver-api-guide/Doxyfile +++ b/doc/driver-api-guide/Doxyfile @@ -7,11 +7,3 @@ INPUT = $(SRCDIR)/doc/driver-api-guide \ $(SRCDIR)/include/odp/drv \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ $(SRCDIR)/include/odp_drv.h -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODPDRV_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODPDRV_PACKED \ - "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" diff --git a/doc/helper-guide/Doxyfile b/doc/helper-guide/Doxyfile index bcc24539..bb9bd8e6 100644 --- a/doc/helper-guide/Doxyfile +++ b/doc/helper-guide/Doxyfile @@ -33,13 +33,5 @@ LAYOUT_FILE = $(SRCDIR)/doc/doxygenlayout.xml ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - "ODP_HANDLE_T(type)=odp_handle_t type" INTERNAL_DOCS = YES DOT_IMAGE_FORMAT = svg diff --git a/doc/platform-api-guide/Doxyfile b/doc/platform-api-guide/Doxyfile index 1f2d49a4..d716b4a3 100644 --- a/doc/platform-api-guide/Doxyfile +++ b/doc/platform-api-guide/Doxyfile @@ -10,12 +10,3 @@ INPUT = $(SRCDIR)/doc/application-api-guide \ $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/api \ $(SRCDIR)/platform/$(WITH_PLATFORM)/arch/$(WITH_ARCH) EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)/platform $(SRCDIR) -PREDEFINED = __GNUC__ \ - __attribute__(x)= \ - ODP_ALIGNED(x)= \ - __BIG_ENDIAN_BITFIELD \ - __LITTLE_ENDIAN_BITFIELD \ - __x86_64__ \ - ODP_PACKED \ - ODP_DEPRECATE(x)=x \ - "ODP_HANDLE_T(type)=odp_handle_t type"
