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 8077D446FE for ; Thu, 24 Nov 2022 22:01:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E23868B71D; Fri, 25 Nov 2022 00:01:07 +0200 (EET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E701568AEB2 for ; Fri, 25 Nov 2022 00:01:00 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id z4so4263670wrr.3 for ; Thu, 24 Nov 2022 14:01:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=LHTH4V4HrTQF2HxbT9g7MWeBXhVh1Q2THAtYn2SmJJM=; b=f+LDwTwJCVXRIIAEgWVTQFvDMZBVOauu9XZu28dzxwwWrSawAf3xo1q5jTycNfePDu N5AJUesmAV5DpqvHW6HJ3JLUbfHGbauhIDg4HAVJ5f0E1AkjarCWtFEFrf0ta814qB7d VPrXa/5L0rkTWJCQPqXuYU0mZpPZZngeuj2Y6deX7D6FDwfUYVaXadzE6issEbJ2YPPy Qw3lGl09nv2WNr5TUUlLU9P05cGwha2YZjWEsj8RGddxQCkSOFD7qbfTgPjNWr+TgPfq GsUYmgeECwUumNXHMzWPDUL/MLsHh1IOIVLbkz2WvzK58Ptu1DMumDkAUNfnXyQOXgab mmtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LHTH4V4HrTQF2HxbT9g7MWeBXhVh1Q2THAtYn2SmJJM=; b=AVp1+HSpAX8dQ0to/FpeXpwRJ02/KT1TRx/JHwhKLSXOPCLXUf/9sL6ONFaGMmK3WA R4yKdF68lAmcChOpNFKSJFopRRFjb6BRtss4TGEHi3yYtJFIUMcGsTlzCuuEdmATlu0V mw+IOSnt3I1lbQODW8GnnXfftSzCo50XKgsHRC9PTEoXcc7BZ99Wb5kv2q9rlClSjA3u QMZc0nfKcRwVKdRsgIm3RmCanchsA11DHfCP4gEVyO/CUlH4sp/eBSPBuTAI8i9+31U+ 2rVIVa69pKf2hWbL7ytWMM1HDRhtyxNZdA5BvQmXFbsCFMPg/LnY8TPoXFS6lzH0mFeM tJVg== X-Gm-Message-State: ANoB5pk5jsyr9RtikwgzT6Sqy0dSpeDF797diT3AL8RUXLEC96rNn3xX Ed3COAiuxw2jd2wi392ZfK8LBESrle40gMR2yMCX0UoTvXQ= X-Google-Smtp-Source: AA0mqf5LpLIclhru4mGow7WZlDRR4uHodAq4Om4upkni9O5N8QXpg3NgDFYXPxAwfymddstKQTEzpNZWQtMadkc4fOU= X-Received: by 2002:a05:6000:5:b0:241:d692:3cc5 with SMTP id h5-20020a056000000500b00241d6923cc5mr13290071wrx.419.1669327260167; Thu, 24 Nov 2022 14:01:00 -0800 (PST) MIME-Version: 1.0 References: <20220924210913.5007-1-epirat07@gmail.com> <489EA9F4-F374-4630-91FA-055EE0142ED6@gmail.com> In-Reply-To: <489EA9F4-F374-4630-91FA-055EE0142ED6@gmail.com> From: =?UTF-8?B?SmFuIEVrc3Ryw7Zt?= Date: Fri, 25 Nov 2022 00:00:47 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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 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: On Wed, Nov 16, 2022 at 7:21 PM Marvin Scholz wrote: > > On 24 Sep 2022, at 23:09, Marvin Scholz wrote: > > > 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. > > --- I can get behind the idea of "always building the full docs, especially if the documentation is otherwise broken.", thus +1 for the idea behind the patch at least. > > 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 Now, I am not 100% sure what the effect of this inclusion is, so it'd be nice if you could enlighten me. I see there are some unconditional definitions in f.ex. libavcodec/Makefile (such as TESTPROGS), but would those be still under the defined NAME (avcodec) or so, and thus effectively not affect the build even where some unconditional definitions exist in the included Makefile? Do excuse me if there is a very similar inclusion for something not enabled just outside of the patch diff context, thus noting that this is completely OK :) > > +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) > > Ping for review Jan _______________________________________________ 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".