Re: [systemd-devel] [PATCH] Always populate EXTRA_DIST
On 07/28/2012 04:43 AM, Bryan Kadzban wrote: Lennart Poettering wrote: On Thu, 07.06.12 23:24, Bryan Kadzban (br...@kadzban.is-a-geek.net) wrote: Bryan Kadzban wrote: make dist can build a different tarball depending on the flags passed to ./configure and the (optional) dependencies found on the system. Move all append-to-EXTRA_DIST operations out of automake conditionals to fix this. Introduce a polkitpolicy_files so that the policy files built still correctly depend on the automake conditionals, but the .in files that get distributed do not. Signed-Off-By: Bryan Kadzban bryan.kadzban.is-a-geek.net Arg, always compile-check. Tested, this time. v2, fixing warnings about polkitpolicy_files not being defined. Looks good, but could you rebase this to current master? Will apply then. v3, rebased. (Finally got time to do this.) Commited. Zbyszek ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] Always populate EXTRA_DIST
Lennart Poettering wrote:
On Thu, 07.06.12 23:24, Bryan Kadzban (br...@kadzban.is-a-geek.net) wrote:
Bryan Kadzban wrote:
make dist can build a different tarball depending on the flags passed
to ./configure and the (optional) dependencies found on the system.
Move all append-to-EXTRA_DIST operations out of automake conditionals to
fix this.
Introduce a polkitpolicy_files so that the policy files built still
correctly depend on the automake conditionals, but the .in files that
get distributed do not.
Signed-Off-By: Bryan Kadzban bryan.kadzban.is-a-geek.net
Arg, always compile-check. Tested, this time.
v2, fixing warnings about polkitpolicy_files not being defined.
Looks good, but could you rebase this to current master? Will apply then.
v3, rebased. (Finally got time to do this.)
diff --git a/Makefile.am b/Makefile.am
index a74a806..e4dfafb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,6 +95,7 @@ lib_LTLIBRARIES =
include_HEADERS =
pkgconfiglib_DATA =
polkitpolicy_in_files =
+polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
dist_man_MANS =
@@ -1950,9 +1951,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
pkgconfiglib_DATA += \
src/gudev/gudev-1.0.pc
-EXTRA_DIST += \
- src/gudev/gudev-1.0.pc.in
-
CLEANFILES += \
src/gudev/gudev-1.0.pc
@@ -2003,14 +2001,6 @@ libgudev_1_0_la_LDFLAGS = \
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
-EXTRA_DIST += \
- src/gudev/gudevmarshal.list \
- src/gudev/gudevenumtypes.h.template \
- src/gudev/gudevenumtypes.c.template \
- src/gudev/gjs-example.js \
- src/gudev/seed-example-enum.js \
- src/gudev/seed-example.js
-
src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
$(AM_V_GEN)glib-genmarshal $ --prefix=g_udev_marshal --header $@
@@ -2091,6 +2081,16 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
endif
+EXTRA_DIST += \
+ src/gudev/gudev-1.0.pc.in \
+ src/gudev/gudevmarshal.list \
+ src/gudev/gudevenumtypes.h.template \
+ src/gudev/gudevenumtypes.c.template \
+ src/gudev/gjs-example.js \
+ src/gudev/seed-example-enum.js \
+ src/gudev/seed-example.js
+
+
#
--
if ENABLE_KEYMAP
keymap_SOURCES = \
@@ -2126,10 +2126,6 @@ dist_udevhome_SCRIPTS = \
TESTS += \
src/udev/keymap/check-keymaps.sh
-EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- src/udev/keymap/keyboard-force-release.sh.in
-
CLEANFILES += \
src/udev/keymap/keys.txt \
src/udev/keymap/keys-from-name.gperf \
@@ -2219,6 +2215,10 @@ src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt
Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print const char* const key_names[KEY_CNT] =
{ } { print [ $$1 ] = \ $$1 \, } END{print };}' $ $@
endif
+EXTRA_DIST += \
+ src/udev/keymap/check-keymaps.sh \
+ src/udev/keymap/keyboard-force-release.sh.in
+
#
--
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
@@ -2550,13 +2550,13 @@ rootlibexec_PROGRAMS += \
sysctl_DATA = \
sysctl.d/coredump.conf
-EXTRA_DIST += \
- sysctl.d/coredump.conf.in
-
CLEANFILES += \
sysctl.d/coredump.conf
endif
+EXTRA_DIST += \
+ sysctl.d/coredump.conf.in
+
#
--
if ENABLE_BINFMT
systemd_binfmt_SOURCES = \
@@ -2597,10 +2597,10 @@ MANPAGES_ALIAS += \
man/systemd-binfmt.8
man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
EXTRA_DIST += \
units/systemd-binfmt.service.in
-endif
#
--
if ENABLE_VCONSOLE
@@ -2634,10 +2634,10 @@ MANPAGES_ALIAS += \
man/systemd-vconsole-setup.8
man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
+endif
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
-endif
#
--
if ENABLE_READAHEAD
@@ -2670,11 +2670,6 @@ nodist_systemunit_DATA += \
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service
-EXTRA_DIST += \
- units/systemd-readahead-collect.service.in \
- units/systemd-readahead-replay.service.in \
- units/systemd-readahead-done.service.in
-
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.3 \
@@ -2693,6 +2688,11 @@ man/systemd-readahead.8:
man/systemd-readahead-replay.service.8
endif
+EXTRA_DIST += \
+ units/systemd-readahead-collect.service.in \
+ units/systemd-readahead-replay.service.in \
+ units/systemd-readahead-done.service.in
+
#
Re: [systemd-devel] [PATCH] Always populate EXTRA_DIST
On Thu, 07.06.12 23:24, Bryan Kadzban (br...@kadzban.is-a-geek.net) wrote: Bryan Kadzban wrote: make dist can build a different tarball depending on the flags passed to ./configure and the (optional) dependencies found on the system. Move all append-to-EXTRA_DIST operations out of automake conditionals to fix this. Introduce a polkitpolicy_files so that the policy files built still correctly depend on the automake conditionals, but the .in files that get distributed do not. Signed-Off-By: Bryan Kadzban bryan.kadzban.is-a-geek.net Arg, always compile-check. Tested, this time. v2, fixing warnings about polkitpolicy_files not being defined. Looks good, but could you rebase this to current master? Will apply then. Thanks! Lennart -- Lennart Poettering - Red Hat, Inc. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH] Always populate EXTRA_DIST
make dist can build a different tarball depending on the flags passed
to ./configure and the (optional) dependencies found on the system.
Move all append-to-EXTRA_DIST operations out of automake conditionals to
fix this.
Introduce a polkitpolicy_files so that the policy files built still
correctly depend on the automake conditionals, but the .in files that
get distributed do not.
Signed-Off-By: Bryan Kadzban bryan.kadzban.is-a-geek.net
diff --git a/Makefile.am b/Makefile.am
index f45fa27..6991391 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1714,9 +1714,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
pkgconfiglib_DATA += \
src/gudev/gudev-1.0.pc
-EXTRA_DIST += \
- src/gudev/gudev-1.0.pc.in
-
CLEANFILES += \
src/gudev/gudev-1.0.pc
@@ -1767,14 +1764,6 @@ libgudev_1_0_la_LDFLAGS = \
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
-EXTRA_DIST += \
- src/gudev/gudevmarshal.list \
- src/gudev/gudevenumtypes.h.template \
- src/gudev/gudevenumtypes.c.template \
- src/gudev/gjs-example.js \
- src/gudev/seed-example-enum.js \
- src/gudev/seed-example.js
-
CLEANFILES += \
$(nodist_libgudev_1_0_la_SOURCES)
@@ -1858,6 +1847,15 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
endif
+EXTRA_DIST += \
+ src/gudev/gudev-1.0.pc.in \
+ src/gudev/gudevmarshal.list \
+ src/gudev/gudevenumtypes.h.template \
+ src/gudev/gudevenumtypes.c.template \
+ src/gudev/gjs-example.js \
+ src/gudev/seed-example-enum.js \
+ src/gudev/seed-example.js
+
#
--
if ENABLE_KEYMAP
keymap_SOURCES = \
@@ -1893,10 +1891,6 @@ dist_udevhome_SCRIPTS = \
TESTS += \
src/udev/keymap/check-keymaps.sh
-EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- src/udev/keymap/keyboard-force-release.sh.in
-
CLEANFILES += \
$(nodist_keymap_SOURCES) \
src/udev/keymap/keys.txt \
@@ -1987,6 +1981,10 @@ src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt
Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print const char* const key_names[KEY_CNT] =
{ } { print [ $$1 ] = \ $$1 \, } END{print };}' $ $@
endif
+EXTRA_DIST += \
+ src/udev/keymap/check-keymaps.sh \
+ src/udev/keymap/keyboard-force-release.sh.in
+
#
--
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
@@ -2288,13 +2286,13 @@ rootlibexec_PROGRAMS += \
sysctl_DATA = \
sysctl.d/coredump.conf
-EXTRA_DIST += \
- sysctl.d/coredump.conf.in
-
CLEANFILES += \
sysctl.d/coredump.conf
endif
+EXTRA_DIST += \
+ sysctl.d/coredump.conf.in
+
#
--
if ENABLE_BINFMT
systemd_binfmt_SOURCES = \
@@ -2335,10 +2333,10 @@ MANPAGES_ALIAS += \
man/systemd-binfmt.8
man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
EXTRA_DIST += \
units/systemd-binfmt.service.in
-endif
#
--
if ENABLE_VCONSOLE
@@ -2366,10 +2364,10 @@ INSTALL_DATA_HOOKS += \
MANPAGES += \
man/vconsole.conf.5
+endif
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
-endif
#
--
if ENABLE_READAHEAD
@@ -2416,16 +2414,16 @@ nodist_systemunit_DATA += \
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service
-EXTRA_DIST += \
- units/systemd-readahead-collect.service.in \
- units/systemd-readahead-replay.service.in \
- units/systemd-readahead-done.service.in
-
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.7
endif
+EXTRA_DIST += \
+ units/systemd-readahead-collect.service.in \
+ units/systemd-readahead-replay.service.in \
+ units/systemd-readahead-done.service.in
+
#
--
if ENABLE_QUOTACHECK
rootlibexec_PROGRAMS += \
@@ -2434,9 +2432,6 @@ rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/quotacheck.service
-EXTRA_DIST += \
- units/quotacheck.service.in
-
systemd_quotacheck_SOURCES = \
src/quotacheck/quotacheck.c
@@ -2444,6 +2439,9 @@ systemd_quotacheck_LDADD = \
libsystemd-shared.la
endif
+EXTRA_DIST += \
+ units/quotacheck.service.in
+
#
--
if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \
@@ -2453,10 +2451,6 @@ nodist_systemunit_DATA += \
units/systemd-random-seed-save.service \
units/systemd-random-seed-load.service
-EXTRA_DIST += \
- units/systemd-random-seed-save.service.in \
-
Re: [systemd-devel] [PATCH] Always populate EXTRA_DIST
Bryan Kadzban wrote:
make dist can build a different tarball depending on the flags passed
to ./configure and the (optional) dependencies found on the system.
Move all append-to-EXTRA_DIST operations out of automake conditionals to
fix this.
Introduce a polkitpolicy_files so that the policy files built still
correctly depend on the automake conditionals, but the .in files that
get distributed do not.
Signed-Off-By: Bryan Kadzban bryan.kadzban.is-a-geek.net
Arg, always compile-check. Tested, this time.
v2, fixing warnings about polkitpolicy_files not being defined.
diff --git a/Makefile.am b/Makefile.am
index f45fa27..0d39f88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,6 +91,7 @@ lib_LTLIBRARIES =
include_HEADERS =
pkgconfiglib_DATA =
polkitpolicy_in_files =
+polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
dist_man_MANS =
@@ -1714,9 +1715,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
pkgconfiglib_DATA += \
src/gudev/gudev-1.0.pc
-EXTRA_DIST += \
- src/gudev/gudev-1.0.pc.in
-
CLEANFILES += \
src/gudev/gudev-1.0.pc
@@ -1767,14 +1765,6 @@ libgudev_1_0_la_LDFLAGS = \
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
-EXTRA_DIST += \
- src/gudev/gudevmarshal.list \
- src/gudev/gudevenumtypes.h.template \
- src/gudev/gudevenumtypes.c.template \
- src/gudev/gjs-example.js \
- src/gudev/seed-example-enum.js \
- src/gudev/seed-example.js
-
CLEANFILES += \
$(nodist_libgudev_1_0_la_SOURCES)
@@ -1858,6 +1848,15 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
endif
+EXTRA_DIST += \
+ src/gudev/gudev-1.0.pc.in \
+ src/gudev/gudevmarshal.list \
+ src/gudev/gudevenumtypes.h.template \
+ src/gudev/gudevenumtypes.c.template \
+ src/gudev/gjs-example.js \
+ src/gudev/seed-example-enum.js \
+ src/gudev/seed-example.js
+
#
--
if ENABLE_KEYMAP
keymap_SOURCES = \
@@ -1893,10 +1892,6 @@ dist_udevhome_SCRIPTS = \
TESTS += \
src/udev/keymap/check-keymaps.sh
-EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- src/udev/keymap/keyboard-force-release.sh.in
-
CLEANFILES += \
$(nodist_keymap_SOURCES) \
src/udev/keymap/keys.txt \
@@ -1987,6 +1982,10 @@ src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt
Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print const char* const key_names[KEY_CNT] =
{ } { print [ $$1 ] = \ $$1 \, } END{print };}' $ $@
endif
+EXTRA_DIST += \
+ src/udev/keymap/check-keymaps.sh \
+ src/udev/keymap/keyboard-force-release.sh.in
+
#
--
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
@@ -2288,13 +2287,13 @@ rootlibexec_PROGRAMS += \
sysctl_DATA = \
sysctl.d/coredump.conf
-EXTRA_DIST += \
- sysctl.d/coredump.conf.in
-
CLEANFILES += \
sysctl.d/coredump.conf
endif
+EXTRA_DIST += \
+ sysctl.d/coredump.conf.in
+
#
--
if ENABLE_BINFMT
systemd_binfmt_SOURCES = \
@@ -2335,10 +2334,10 @@ MANPAGES_ALIAS += \
man/systemd-binfmt.8
man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
EXTRA_DIST += \
units/systemd-binfmt.service.in
-endif
#
--
if ENABLE_VCONSOLE
@@ -2366,10 +2365,10 @@ INSTALL_DATA_HOOKS += \
MANPAGES += \
man/vconsole.conf.5
+endif
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
-endif
#
--
if ENABLE_READAHEAD
@@ -2416,16 +2415,16 @@ nodist_systemunit_DATA += \
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service
-EXTRA_DIST += \
- units/systemd-readahead-collect.service.in \
- units/systemd-readahead-replay.service.in \
- units/systemd-readahead-done.service.in
-
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.7
endif
+EXTRA_DIST += \
+ units/systemd-readahead-collect.service.in \
+ units/systemd-readahead-replay.service.in \
+ units/systemd-readahead-done.service.in
+
#
--
if ENABLE_QUOTACHECK
rootlibexec_PROGRAMS += \
@@ -2434,9 +2433,6 @@ rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/quotacheck.service
-EXTRA_DIST += \
- units/quotacheck.service.in
-
systemd_quotacheck_SOURCES = \
src/quotacheck/quotacheck.c
@@ -2444,6 +2440,9 @@ systemd_quotacheck_LDADD = \
libsystemd-shared.la
endif
+EXTRA_DIST += \
+ units/quotacheck.service.in
+
#
