Attachment 88441 Details for Bug 71100 – [after merge 1/7] Don't remove _gen in clean, only in distclean

[patch] [after merge 1/7] Don't remove _gen in clean, only in distclean

0001-Don-t-remove-_gen-in-clean-only-in-distclean.patch (text/plain), 3.63 KB, created by Simon McVittie on 2013-10-31 18:32:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-31 18:32:17 UTC

Size: 3.63 KB

patch

obsolete

>From 6ea0be67152fb195d9edca7b718916b5b2b1b200 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 31 Oct 2013 16:20:32 +0000
>Subject: [PATCH 1/7] Don't remove _gen in clean, only in distclean
>
>With subdir-objects enabled, Automake dependency-tracking files are
>written in _gen/.deps, and deleting them breaks the build.
>---
> examples/cm/call/Makefile.am               | 2 +-
> examples/cm/channelspecific/Makefile.am    | 2 +-
> examples/cm/contactlist/Makefile.am        | 2 +-
> examples/cm/echo-message-parts/Makefile.am | 2 +-
> examples/cm/extended/Makefile.am           | 2 +-
> examples/cm/no-protocols/Makefile.am       | 2 +-
> examples/extensions/Makefile.am            | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
>index 2643a03..e12f5e6 100644
>--- a/examples/cm/call/Makefile.am
>+++ b/examples/cm/call/Makefile.am
>@@ -47,7 +47,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_call.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
>index 9e015ea..b3dfb68 100644
>--- a/examples/cm/channelspecific/Makefile.am
>+++ b/examples/cm/channelspecific/Makefile.am
>@@ -44,7 +44,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_csh.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
>index ff42e57..cda6477 100644
>--- a/examples/cm/contactlist/Makefile.am
>+++ b/examples/cm/contactlist/Makefile.am
>@@ -40,7 +40,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_contact_list.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
>index 4f05d56..9d9ce6d 100644
>--- a/examples/cm/echo-message-parts/Makefile.am
>+++ b/examples/cm/echo-message-parts/Makefile.am
>@@ -40,7 +40,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_echo_2.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
>index 9b0f988..c8c2380 100644
>--- a/examples/cm/extended/Makefile.am
>+++ b/examples/cm/extended/Makefile.am
>@@ -28,7 +28,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_extended.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
>index 7c4db14..143641e 100644
>--- a/examples/cm/no-protocols/Makefile.am
>+++ b/examples/cm/no-protocols/Makefile.am
>@@ -24,7 +24,7 @@ managerdir = ${datadir}/telepathy/managers
> dist_manager_DATA = example_no_protocols.manager
> endif
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
>diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
>index a7d8fb2..d6ba447 100644
>--- a/examples/extensions/Makefile.am
>+++ b/examples/extensions/Makefile.am
>@@ -63,7 +63,7 @@ BUILT_SOURCES = \
> 
> CLEANFILES = $(BUILT_SOURCES)
> 
>-clean-local:
>+distclean-local:
> 	rm -rf _gen
> 
> XSLTPROCFLAGS = --nonet --novalid
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 71100: 88426 | 88427 | 88428 | 88429 | 88430 | 88431 | 88432 | 88433 | 88434 | 88435 | 88436 | 88437 | 88438 | 88439 | 88440 | 88441 | 88442 | 88443 | 88444 | 88445 | 88446 | 88447 | 88603

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.