From patchwork Sat Sep 24 21:09:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1326552pzh; Sat, 24 Sep 2022 14:09:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM502NRKS8ClWhvFvzH3CWgThK8oIwM2CtvPIx2n/UPJpDEbBNR89ZZM10Y5cdAO4te3OxFD X-Received: by 2002:a50:fc9a:0:b0:454:6a56:7d27 with SMTP id f26-20020a50fc9a000000b004546a567d27mr14805765edq.73.1664053774520; Sat, 24 Sep 2022 14:09:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664053774; cv=none; d=google.com; s=arc-20160816; b=E7VkiVkXTd0/NvpUCB+IvuK/GanxxOaCXCP+q7RjSClaIJZdcyO1Bdzc8JvW6nqR74 WBvMxP1altPgIKYrOTJbpmNGHXUGOWi90Vb2UQ707YoJhsXmwU4xv0FU7IzOfbbwd6sQ p/1yYPqzeSNrwSTfYfp36EHJEUQEaLlfGVIwb8PrydYhs2p/kxYAam0TnwtpRG5fA4F6 X3hE4CjSy4ec4nPe7iNbCuKrolipeMXoqCnMcHAM9pL+LolvpskU4LtxE71LUYO243tp iiw4hIujst3dPT/2xTk8iDNnny3Zi+tR3++RpYUMFynL/5NaA3oKYKtQA+NNRgQyrPnL TYoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=4pQGBOoqIWRmHT4XOHrRchSa5rSHYfyzhGzVxkZjElQ=; b=YSkkpnLNLqfRI0IotVkq5IqKGMtjMBHTLoPbUNrvCuA7aRdS72COB2jTj1fW+vln6r 9AUjA95agyix9WdOIkiax3LKsXtgJR96qETSNYyNpHKQSEAzen5DGDPFHZk8qBvHjvyr eq/yM1ubJKFrTgaCWEppQvAqRCw99GIUeT3PrtGiLkRmAEGIeoF6J7wLCz4ojTHt+Mxc RDy4HLbTU3HHpG35yoOcBIMS8m7Zz2slfWPacuO7Ex2zUvXgoqILyXHlnAKPfeumD6e9 ejlqLdf/2kgdFjJ/yOOd32piUQ2JGJ+Ti47kc/TcYx+6SWWBm7RzQRAelBCEBS2OqWtu b9pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oTeklmP6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e5-20020a17090658c500b0072aeac5f74bsi9828142ejs.119.2022.09.24.14.09.31; Sat, 24 Sep 2022 14:09:34 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oTeklmP6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F6DF68BA4E; Sun, 25 Sep 2022 00:09:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A22068B7C0 for ; Sun, 25 Sep 2022 00:09:21 +0300 (EEST) Received: by mail-ed1-f43.google.com with SMTP id z97so4361629ede.8 for ; Sat, 24 Sep 2022 14:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=JKxzyBNcsguu/ebsGjWRDuO3KLv52Q5a/CA7MxtBLAA=; b=oTeklmP6kOVYrgIngn+FeGC06JNLE/76/2GPzRgnYkB8y78lebcW67zCObaabdansK hnlnuKbKXdjWZHU0NoLUAG4rX2NvqTRd68a9IIMAHB0A70GembbVKnHpErRCWRPLJ8y/ Bjv2fJ9IvdhkbR7+IFaXPzUGBkwh5V6uew++gMVJpLzUTr3gWt9zlSkqpMq4vG33Ciud IXJX0cgBm9vu9ATb9gbYmJzarrYcBN8qhh2nCsCZOZO212SY5e3Ollz0ClOLmZaWGjzO VYq3Gptei+vlha5rPH5TsEwoMqQeF81u8+e8Ujgc1U8dSPKmWE74v22mawXMme9pWZml hNTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=JKxzyBNcsguu/ebsGjWRDuO3KLv52Q5a/CA7MxtBLAA=; b=KGCD+nivKrOdLeFqzjtFVr6CTzdOiS/68vOVl+BpOuHZH91KPbqkIHl2ngiFnxCz9F 8t5PbcVNv90//g9L0MNsr1nBpHxUQm9SV8QOIcK/9EtzfoGCnBXoB6v3Qn3iXzE+lCEi URpUIT6fU4T/FPV4qVC/VwksXF1Qx+espk+UNchXkWxsUzcQaLTdQzq7QUUL8sc4tUvj CBEZXb9kTzaQHLA7Xk/3rI2+ZbG7fvuHfGjoYgVUeNP5l+GA8m3qoSuxHANcjTmp5jNG ++yOKUUOHBXE83fdUi74hAS6DAZCKYo7KFO3ghJYMzO2Qu5MHX8GtyMWhFmXdGneIv8+ vzjQ== X-Gm-Message-State: ACrzQf14xzGlGIoinREkvC8XNEfRzHgdjID0jx/joMQfqdSE/Q0c++1M rrqMzD0bi+dQluS5/UM2TOE5WunSHlE= X-Received: by 2002:a05:6402:e87:b0:456:c93c:5361 with SMTP id h7-20020a0564020e8700b00456c93c5361mr8677967eda.88.1664053760252; Sat, 24 Sep 2022 14:09:20 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id g5-20020a056402320500b00456ddead51asm2921095eda.16.2022.09.24.14.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 14:09:19 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Sep 2022 23:09:12 +0200 Message-Id: <20220924210913.5007-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Makefile: Build complete doc with Doxygen X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ilVX79wr9KDO Add DISABLEDINSTHEADERS, a variable containing the headers of disabled libraries. This is needed so that Doxygen does not generate incomplete documentation when a component is disabled, which is quite unexpected behaviour and results in warnings due to, among other things, broken references. --- Makefile | 10 ++++++++++ doc/Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61f79e27ae..26714950b7 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,17 @@ include $(SRC_PATH)/$(1)/Makefile include $(SRC_PATH)/ffbuild/library.mak endef +define DODISABLEDSUBDIR +$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) +SUBDIR := $(1)/ +include $(SRC_PATH)/$(1)/Makefile +DISABLEDINSTHEADERS := $$(DISABLEDINSTHEADERS) $$(HEADERS:%=$$(SUBDIR)%) +endef + +DISABLEDFFLIBS := $(filter-out $(FFLIBS),$(ALLFFLIBS)) + $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) +$(foreach D,$(DISABLEDFFLIBS),$(eval $(call DODISABLEDSUBDIR,lib$(D)))) include $(SRC_PATH)/fftools/Makefile include $(SRC_PATH)/doc/Makefile diff --git a/doc/Makefile b/doc/Makefile index 25774c7bad..d71a02e408 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -100,7 +100,7 @@ doc/%.3: doc/%.pod $(GENTEXI) $(DOCS) doc/doxy/html: | doc/ -DOXY_INPUT = $(INSTHEADERS) +DOXY_INPUT = $(INSTHEADERS) $(DISABLEDINSTHEADERS) DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak doc/doxy/html: TAG = DOXY