Contents of /trunk/systemd/patches/systemd-220-dont-dist-generated-files.patch
Parent Directory | Revision Log
Revision 2585 -
(show annotations)
(download)
Thu Jun 18 13:02:49 2015 UTC (9 years, 3 months ago) by niro
File size: 1787 byte(s)
Thu Jun 18 13:02:49 2015 UTC (9 years, 3 months ago) by niro
File size: 1787 byte(s)
-fix build with audit support disabled
1 | From ee3c31bf69746c5afc764c3d0337feec1bf25f0e Mon Sep 17 00:00:00 2001 |
2 | From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> |
3 | Date: Mon, 25 May 2015 11:18:18 +0200 |
4 | Subject: build-sys: don't dist generated files |
5 | |
6 | [tomegun: fix |
7 | Makefile.am:5675: warning: nodist_systemd_resolved_SOURCES multiply defined in condition ENABLE_RESOLVED] |
8 | |
9 | diff --git a/Makefile.am b/Makefile.am |
10 | index 9420879..1bfccfd 100644 |
11 | --- a/Makefile.am |
12 | +++ b/Makefile.am |
13 | @@ -1259,8 +1259,7 @@ DISTCLEANFILES = \ |
14 | |
15 | EXTRA_DIST += \ |
16 | $(gperf_gperf_m4_sources) \ |
17 | - $(gperf_gperf_sources) \ |
18 | - $(gperf_txt_sources:-list.txt=-from-name.gperf) |
19 | + $(gperf_gperf_sources) |
20 | |
21 | CLEANFILES += \ |
22 | $(gperf_txt_sources) |
23 | @@ -4652,7 +4651,9 @@ libsystemd_journal_internal_la_SOURCES = \ |
24 | src/journal/mmap-cache.h \ |
25 | src/journal/compress.c \ |
26 | src/journal/audit-type.h \ |
27 | - src/journal/audit-type.c \ |
28 | + src/journal/audit-type.c |
29 | + |
30 | +nodist_libsystemd_journal_internal_la_SOURCES = \ |
31 | src/journal/audit_type-to-name.h |
32 | |
33 | gperf_txt_sources += \ |
34 | @@ -5665,11 +5666,11 @@ systemd_resolved_SOURCES = \ |
35 | src/resolve/resolved-dns-stream.h \ |
36 | src/resolve/resolved-dns-stream.c \ |
37 | src/resolve/dns-type.c \ |
38 | - src/resolve/dns-type.h \ |
39 | - src/resolve/dns_type-from-name.h \ |
40 | - src/resolve/dns_type-to-name.h |
41 | + src/resolve/dns-type.h |
42 | |
43 | nodist_systemd_resolved_SOURCES = \ |
44 | + src/resolve/dns_type-from-name.h \ |
45 | + src/resolve/dns_type-to-name.h \ |
46 | src/resolve/resolved-gperf.c |
47 | |
48 | gperf_gperf_sources += \ |
49 | @@ -5766,7 +5767,9 @@ systemd_resolve_host_SOURCES = \ |
50 | src/resolve/resolved-dns-domain.c \ |
51 | src/resolve/resolved-dns-domain.h \ |
52 | src/resolve/dns-type.c \ |
53 | - src/resolve/dns-type.h \ |
54 | + src/resolve/dns-type.h |
55 | + |
56 | +nodist_systemd_resolve_host_SOURCES = \ |
57 | src/resolve/dns_type-from-name.h \ |
58 | src/resolve/dns_type-to-name.h |
59 | |
60 | -- |
61 | cgit v0.10.2 |
62 |