From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 34CA1440AB for ; Sat, 24 Sep 2022 21:09:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECB7E68BA4D; Sun, 25 Sep 2022 00:09:27 +0300 (EEST) 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-Google-Smtp-Source: AMsMyM5Ab/w4FzYI/mX2H1JdhVqQyGsHdP8VfltGEc9mW6PPpoeiZSA5vC5+GX+gTpgKP4bIxkgEfA== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".