[systemd-devel] [PATCH 2/2] build-sys: don't dist generated files

2015-05-25 Thread Marc-Antoine Perennou
---
 Makefile.am | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9420879..4933e6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1259,8 +1259,7 @@ DISTCLEANFILES = \
 
 EXTRA_DIST += \
$(gperf_gperf_m4_sources) \
-   $(gperf_gperf_sources) \
-   $(gperf_txt_sources:-list.txt=-from-name.gperf)
+   $(gperf_gperf_sources)
 
 CLEANFILES += \
$(gperf_txt_sources)
@@ -4652,7 +4651,9 @@ libsystemd_journal_internal_la_SOURCES = \
src/journal/mmap-cache.h \
src/journal/compress.c \
src/journal/audit-type.h \
-   src/journal/audit-type.c \
+   src/journal/audit-type.c
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
src/journal/audit_type-to-name.h
 
 gperf_txt_sources += \
@@ -5665,7 +5666,9 @@ systemd_resolved_SOURCES = \
src/resolve/resolved-dns-stream.h \
src/resolve/resolved-dns-stream.c \
src/resolve/dns-type.c \
-   src/resolve/dns-type.h \
+   src/resolve/dns-type.h
+
+nodist_systemd_resolved_SOURCES = \
src/resolve/dns_type-from-name.h \
src/resolve/dns_type-to-name.h
 
@@ -5766,7 +5769,9 @@ systemd_resolve_host_SOURCES = \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-dns-domain.h \
src/resolve/dns-type.c \
-   src/resolve/dns-type.h \
+   src/resolve/dns-type.h
+
+nodist_systemd_resolve_host_SOURCES = \
src/resolve/dns_type-from-name.h \
src/resolve/dns_type-to-name.h
 
-- 
2.4.1

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH 2/2] build-sys: don't dist generated files

2015-05-25 Thread systemd github import bot
Patchset imported to github.
Pull request:
https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432545498-10891-2-git-send-email-Marc-Antoine%40Perennou.com

--
Generated by https://github.com/haraldh/mail2git
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH 2/2] build-sys: don't dist generated files

2015-05-25 Thread Tom Gundersen
Applied, with minor fix. Please verify that it still works for you!

Tom

On Mon, May 25, 2015 at 11:18 AM, Marc-Antoine Perennou
marc-anto...@perennou.com wrote:
 ---
  Makefile.am | 15 ++-
  1 file changed, 10 insertions(+), 5 deletions(-)

 diff --git a/Makefile.am b/Makefile.am
 index 9420879..4933e6f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1259,8 +1259,7 @@ DISTCLEANFILES = \

  EXTRA_DIST += \
 $(gperf_gperf_m4_sources) \
 -   $(gperf_gperf_sources) \
 -   $(gperf_txt_sources:-list.txt=-from-name.gperf)
 +   $(gperf_gperf_sources)

  CLEANFILES += \
 $(gperf_txt_sources)
 @@ -4652,7 +4651,9 @@ libsystemd_journal_internal_la_SOURCES = \
 src/journal/mmap-cache.h \
 src/journal/compress.c \
 src/journal/audit-type.h \
 -   src/journal/audit-type.c \
 +   src/journal/audit-type.c
 +
 +nodist_libsystemd_journal_internal_la_SOURCES = \
 src/journal/audit_type-to-name.h

  gperf_txt_sources += \
 @@ -5665,7 +5666,9 @@ systemd_resolved_SOURCES = \
 src/resolve/resolved-dns-stream.h \
 src/resolve/resolved-dns-stream.c \
 src/resolve/dns-type.c \
 -   src/resolve/dns-type.h \
 +   src/resolve/dns-type.h
 +
 +nodist_systemd_resolved_SOURCES = \
 src/resolve/dns_type-from-name.h \
 src/resolve/dns_type-to-name.h

 @@ -5766,7 +5769,9 @@ systemd_resolve_host_SOURCES = \
 src/resolve/resolved-dns-domain.c \
 src/resolve/resolved-dns-domain.h \
 src/resolve/dns-type.c \
 -   src/resolve/dns-type.h \
 +   src/resolve/dns-type.h
 +
 +nodist_systemd_resolve_host_SOURCES = \
 src/resolve/dns_type-from-name.h \
 src/resolve/dns_type-to-name.h

 --
 2.4.1

 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH 2/2] build-sys: don't dist generated files

2015-05-25 Thread Marc-Antoine Perennou
Works fine, thanks!

On 25 May 2015 at 17:04, Tom Gundersen t...@jklm.no wrote:
 Applied, with minor fix. Please verify that it still works for you!

 Tom
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel