Attachment 81466 Details for Bug 48277 – Use GNU make features to reduce repetition

[patch] Use GNU make features to reduce repetition

0002-Use-GNU-make-features-to-reduce-repetition.patch (text/plain), 1.96 KB, created by Simon McVittie on 2013-06-26 12:02:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-06-26 12:02:23 UTC

Size: 1.96 KB

patch

obsolete

>From 4ce80aabe732cf765feda29239b36a427b626146 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 26 Jun 2013 12:33:29 +0100
>Subject: [PATCH 2/2] Use GNU make features to reduce repetition
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48277
>---
> doc/Makefile.am  | 30 +++++++++---------------------
> test/Makefile.am |  6 +-----
> 2 files changed, 10 insertions(+), 26 deletions(-)
>
>diff --git a/doc/Makefile.am b/doc/Makefile.am
>index aa5c7e1..b9a4c10 100644
>--- a/doc/Makefile.am
>+++ b/doc/Makefile.am
>@@ -1,34 +1,22 @@
> apidir = @htmldir@/api
> 
>-MAN_XML_FILES = \
>-	dbus-cleanup-sockets.1.xml \
>-	dbus-daemon.1.xml \
>-	dbus-launch.1.xml \
>-	dbus-monitor.1.xml \
>-	dbus-run-session.1.xml \
>-	dbus-send.1.xml \
>-	dbus-uuidgen.1.xml \
>-	$(NULL)
>-
>-if DBUS_XML_DOCS_ENABLED
>-man1_MANS = \
>+man_pages = \
> 	dbus-cleanup-sockets.1 \
> 	dbus-daemon.1 \
> 	dbus-launch.1 \
> 	dbus-monitor.1 \
> 	dbus-run-session.1 \
> 	dbus-send.1 \
>-	dbus-uuidgen.1
>+	dbus-uuidgen.1 \
>+	$(NULL)
>+
>+MAN_XML_FILES = $(patsubst %.1,%.1.xml,$(man_pages))
>+
>+if DBUS_XML_DOCS_ENABLED
>+man1_MANS = $(man_pages)
> endif
> 
>-MAN_HTML_FILES = \
>-	dbus-cleanup-sockets.1.html \
>-	dbus-daemon.1.html \
>-	dbus-launch.1.html \
>-	dbus-monitor.1.html \
>-	dbus-run-session.1.html \
>-	dbus-send.1.html \
>-	dbus-uuidgen.1.html
>+MAN_HTML_FILES = $(patsubst %.1,%.1.html,$(man_pages))
> 
> DTDS = \
> 	busconfig.dtd \
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 6f0e6e1..4ea326d 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -323,10 +323,6 @@ imported_data = \
> noinst_DATA = $(imported_data)
> CLEANFILES = $(noinst_DATA)
> 
>-data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf
>-	$(AM_V_at)$(MKDIR_P) data/valid-config-files
>-	$(AM_V_GEN)cp $< $@
>-
>-data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
>+$(imported_data): data/valid-config-files/%.conf: $(top_builddir)/bus/%.conf
> 	$(AM_V_at)$(MKDIR_P) data/valid-config-files
> 	$(AM_V_GEN)cp $< $@
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 48277: 59461 | 81465 | 81466

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.