Set proper dependency for string replacement targets

A lot of string replacement target don't have dependency or incorrect
dependency. We setup proper dependency by pattern rules.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4908

diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am
index 0a2170bfc6772eea34f2a1675420d6d3c6d6f2d6..a5c567c161c85789f03a9ae2de234a835c86d2e0 100644 (file)
--- a/contrib/dracut/02zfsexpandknowledge/Makefile.am
+++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am
@@ -5,7 +5,7 @@ pkgdracut_SCRIPTS = \
 EXTRA_DIST = \
        $(top_srcdir)/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
 
-$(pkgdracut_SCRIPTS):
+$(pkgdracut_SCRIPTS):%:%.in
        -$(SED) -e 's,@bindir\@,$(bindir),g' \
                -e 's,@sbindir\@,$(sbindir),g' \
                -e 's,@datadir\@,$(datadir),g' \
@@ -13,7 +13,7 @@ $(pkgdracut_SCRIPTS):
                -e 's,@udevdir\@,$(udevdir),g' \
                -e 's,@udevruledir\@,$(udevruledir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
-               "$(top_srcdir)/contrib/dracut/02zfsexpandknowledge/$@.in" >'$@'
+               $< >'$@'
 
 clean-local::
        -$(RM) $(pkgdracut_SCRIPTS)

diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
index f81d6c3575b37479e7f76a09ba9947769ae159be..2777a814276891931268a5796dba1d9ccb3426dc 100644 (file)
--- a/contrib/dracut/90zfs/Makefile.am
+++ b/contrib/dracut/90zfs/Makefile.am
@@ -15,14 +15,14 @@ EXTRA_DIST = \
        $(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \
        $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in
 
-$(pkgdracut_SCRIPTS):
+$(pkgdracut_SCRIPTS):%:%.in
        -$(SED) -e 's,@bindir\@,$(bindir),g' \
                -e 's,@sbindir\@,$(sbindir),g' \
                -e 's,@udevdir\@,$(udevdir),g' \
                -e 's,@udevruledir\@,$(udevruledir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                -e 's,@systemdunitdir\@,$(systemdunitdir),g' \
-               "$(top_srcdir)/contrib/dracut/90zfs/$@.in" >'$@'
+               $< >'$@'
 
 distclean-local::
        -$(RM) $(pkgdracut_SCRIPTS)

diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
index c6e29d1a5d2dc485575918e0d37a4064d68e1bb9..247db0aba82d1c5185c8a62d1a4ef96e65328f93 100644 (file)
--- a/etc/init.d/Makefile.am
+++ b/etc/init.d/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = \
        $(top_srcdir)/etc/init.d/zfs-zed.in \
        $(top_srcdir)/etc/init.d/zfs.in
 
-$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
+$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in
        -(if [ -e /etc/debian_version ]; then \
                NFS_SRV=nfs-kernel-server; \
          else \
@@ -36,7 +36,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
                 -e 's,@runstatedir\@,$(runstatedir),g' \
                 -e "s,@SHELL\@,$$SHELL,g" \
                 -e "s,@NFS_SRV\@,$$NFS_SRV,g" \
-                "$(top_srcdir)/etc/init.d/$@.in" >'$@'; \
+                $< >'$@'; \
          [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
                chmod +x '$@')
 

diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am
index a6780e1f08385c07498258b9b9fb245e48ab70b0..58c7acd44e7ca8be0a7651dc755290db393e1073 100644 (file)
--- a/etc/modules-load.d/Makefile.am
+++ b/etc/modules-load.d/Makefile.am
@@ -4,10 +4,10 @@ modulesload_DATA = \
 EXTRA_DIST = \
        $(top_srcdir)/etc/modules-load.d/zfs.conf.in
 
-$(modulesload_DATA):
+$(modulesload_DATA):%:%.in
        -$(SED) \
                -e '' \
-               "$(top_srcdir)/etc/modules-load.d/$@.in" >'$@'
+               $< >'$@'
 
 distclean-local::
        -$(RM) $(modulesload_DATA)

diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index f7023dff07097a026164d7e3fd8cf47df90bb08a..b097497e050f406085e2efa7e4c5ff50599b597b 100644 (file)
--- a/etc/systemd/system/Makefile.am
+++ b/etc/systemd/system/Makefile.am
@@ -18,19 +18,12 @@ EXTRA_DIST = \
        $(top_srcdir)/etc/systemd/system/zfs.target.in \
        $(top_srcdir)/etc/systemd/system/50-zfs.preset.in
 
-$(systemdunit_DATA):
+$(systemdunit_DATA) $(systemdpreset_DATA):%:%.in
        -$(SED) -e 's,@bindir\@,$(bindir),g' \
                -e 's,@runstatedir\@,$(runstatedir),g' \
                -e 's,@sbindir\@,$(sbindir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
-               "$(top_srcdir)/etc/systemd/system/$@.in" >'$@'
-
-$(systemdpreset_DATA):
-       -$(SED) -e 's,@bindir\@,$(bindir),g' \
-               -e 's,@runstatedir\@,$(runstatedir),g' \
-               -e 's,@sbindir\@,$(sbindir),g' \
-               -e 's,@sysconfdir\@,$(sysconfdir),g' \
-               "$(top_srcdir)/etc/systemd/system/$@.in" >'$@'
+               $< >'$@'
 
 distclean-local::
        -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)

diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
index febbb4818af8084fd99d478be1003bf35a286fa5..f79ea4b3c3e4619ca8389c0ca2ac3825097d4e87 100644 (file)
--- a/udev/rules.d/Makefile.am
+++ b/udev/rules.d/Makefile.am
@@ -8,13 +8,13 @@ EXTRA_DIST = \
        $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
        $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 
-$(udevrule_DATA):
+$(udevrule_DATA):%:%.in
        -$(SED) -e 's,@bindir\@,$(bindir),g' \
                -e 's,@sbindir\@,$(sbindir),g' \
                -e 's,@udevdir\@,$(udevdir),g' \
                -e 's,@udevruledir\@,$(udevruledir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
-               "$(top_srcdir)/udev/rules.d/$@.in" > '$@'
+               $< > '$@'
 
 distclean-local::
        -$(RM) $(udevrule_DATA)