From patchwork Thu Jul 16 15:55:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6808611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BB50FC05AC for ; Thu, 16 Jul 2015 15:51:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA91B20680 for ; Thu, 16 Jul 2015 15:51:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5C6492061E for ; Thu, 16 Jul 2015 15:51:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2FBA76EC65; Thu, 16 Jul 2015 08:51:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 433866EC65 for ; Thu, 16 Jul 2015 08:51:31 -0700 (PDT) Received: by wibud3 with SMTP id ud3so20277152wib.0 for ; Thu, 16 Jul 2015 08:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=T5hDlJyK+KvfL2t1jH3lfZnO+/7iz3R0w7l+lVKyex4=; b=lIqQeMMsNRQD+5ZJr21BKsyvgzGOtjTMOYHJf4YrR08I/ac2paiNwP/fR04G+2KFGt KWp5D61Fm5ADwdwXeixPLV8/IgqzGDW1NMtMLjltCMJhumqXxXCui5e9ej0hk5gyZHO+ Zsdc/JvOfvXYo5ZfdKhGR8StqfZ+yRbqvbmKcUlwDYWRfJOrEu6bLrH89Z9gAVpwpqzg wM+xWS5rp+fB3AKNab4t2JhKrAgqybE3MQzpE/i/1753TLEz88rG9Q7rq6znmi0AA01U pyl3RdNf0kZw+xZq46qleBfDpjeoNDCX3i/jtPPIowvXF1GTPfPjSf5lo7YRSLwOn8ZA Wcrw== X-Received: by 10.194.84.179 with SMTP id a19mr19831399wjz.29.1437061889868; Thu, 16 Jul 2015 08:51:29 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by smtp.gmail.com with ESMTPSA id gb16sm3901391wic.5.2015.07.16.08.51.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jul 2015 08:51:29 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] man: remove .man_fixup workaround Date: Thu, 16 Jul 2015 16:55:40 +0100 Message-Id: <1437062140-21670-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.4.5 Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The whole thing is quite messy - the file is used to indicate that the man pages were correctly generated prior to applying the "fixup" (alias) At the same time we use a rule with the same name, to create the same file if the generation has failed. In other words - it attempts to create the file either way. So there is little point in it and we can remove it. Spotted while attempting to build with bmake which kindly blocked on the following (non compliant construct) .man_fixup: | $(miscman_DATA) Cc: Jonathan Gray Signed-off-by: Emil Velikov --- Jonathan, With the following patch libdrm build fine on my Arch + bmake. The `dist' target is still broken, yet `all' and `check' work great. Will you guys consider moving back to the upstream build ? As mentioned before if there are problems do mention/file bugs so that we can get them sorted. -Emil man/Makefile.am | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 44b63a5..00eb423 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -37,7 +37,7 @@ MAN_FILES = \ $(miscman_aliases_DATA) EXTRA_DIST = $(XML_FILES) -CLEANFILES = $(MAN_FILES) .man_fixup +CLEANFILES = $(MAN_FILES) XSLTPROC_FLAGS = \ --stringparam man.authors.section.enabled 0 \ @@ -48,14 +48,9 @@ XSLTPROC_FLAGS = \ $(MANPAGES_STYLESHEET) XSLTPROC_PROCESS_MAN = \ - $(AM_V_GEN)$(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) "$<" && \ - touch .man_fixup + $(AM_V_GEN)$(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) "$<" -# Force .man_fixup if $(miscman_DATA) are not built -.man_fixup: | $(miscman_DATA) - $(AM_V_GEN)touch .man_fixup - -$(miscman_aliases_DATA): $(miscman_DATA) .man_fixup +$(miscman_aliases_DATA): $(miscman_DATA) $(AM_V_GEN)if test -n "$@" ; then $(SED) -i -e 's/^\.so \([a-z_]\+\)\.\([0-9]\)$$/\.so man\2\/\1\.\2/' "$@" ; fi SUFFIXES = .$(LIB_MAN_SUFFIX) .$(MISC_MAN_SUFFIX) .xml