summaryrefslogtreecommitdiffstats
path: root/cmd/zed/Makefile.am
diff options
context:
space:
mode:
authorTurbo Fredriksson <[email protected]>2014-06-09 23:55:31 +0200
committerBrian Behlendorf <[email protected]>2015-07-17 13:42:51 -0700
commit47a4a6fd5fa1f1f60bcf6af19e453ecf0292f7d1 (patch)
tree00c149a4fc58c4a0467c3ef68fbc29628966aa2b /cmd/zed/Makefile.am
parent2a53e2dacc7a7c0a8c63ff2eef3aff95f6ac80b1 (diff)
Support parallel build trees (VPATH builds)
Build products from an out of tree build should be written relative to the build directory. Sources should be referred to by their locations in the source directory. This is accomplished by adding the 'src' and 'obj' variables for the module Makefile.am, using relative paths to reference source files, and by setting VPATH when source files are not co-located with the Makefile. This enables the following: $ mkdir build $ cd build $ ../configure \ --with-spl=$HOME/src/git/spl/ \ --with-spl-obj=$HOME/src/git/spl/build $ make -s This change also has the advantage of resolving the following warning which is generated by modern versions of automake. Makefile.am:00: warning: source file 'xxx' is in a subdirectory, Makefile.am:00: but option 'subdir-objects' is disabled Signed-off-by: Turbo Fredriksson <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #1082
Diffstat (limited to 'cmd/zed/Makefile.am')
-rw-r--r--cmd/zed/Makefile.am54
1 files changed, 27 insertions, 27 deletions
diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
index f0d22411d..70e4f7f69 100644
--- a/cmd/zed/Makefile.am
+++ b/cmd/zed/Makefile.am
@@ -4,25 +4,25 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include
-EXTRA_DIST = $(top_srcdir)/cmd/zed/zed.d/README
+EXTRA_DIST = zed.d/README
sbin_PROGRAMS = zed
zed_SOURCES = \
- $(top_srcdir)/cmd/zed/zed.c \
- $(top_srcdir)/cmd/zed/zed.h \
- $(top_srcdir)/cmd/zed/zed_conf.c \
- $(top_srcdir)/cmd/zed/zed_conf.h \
- $(top_srcdir)/cmd/zed/zed_event.c \
- $(top_srcdir)/cmd/zed/zed_event.h \
- $(top_srcdir)/cmd/zed/zed_exec.c \
- $(top_srcdir)/cmd/zed/zed_exec.h \
- $(top_srcdir)/cmd/zed/zed_file.c \
- $(top_srcdir)/cmd/zed/zed_file.h \
- $(top_srcdir)/cmd/zed/zed_log.c \
- $(top_srcdir)/cmd/zed/zed_log.h \
- $(top_srcdir)/cmd/zed/zed_strings.c \
- $(top_srcdir)/cmd/zed/zed_strings.h
+ zed.c \
+ zed.h \
+ zed_conf.c \
+ zed_conf.h \
+ zed_event.c \
+ zed_event.h \
+ zed_exec.c \
+ zed_exec.h \
+ zed_file.c \
+ zed_file.h \
+ zed_log.c \
+ zed_log.h \
+ zed_strings.c \
+ zed_strings.h
zed_LDADD = \
$(top_builddir)/lib/libavl/libavl.la \
@@ -35,22 +35,22 @@ zed_LDADD = \
zedconfdir = $(sysconfdir)/zfs/zed.d
dist_zedconf_DATA = \
- $(top_srcdir)/cmd/zed/zed.d/zed-functions.sh \
- $(top_srcdir)/cmd/zed/zed.d/zed.rc
+ zed.d/zed-functions.sh \
+ zed.d/zed.rc
zedexecdir = $(libexecdir)/zfs/zed.d
dist_zedexec_SCRIPTS = \
- $(top_srcdir)/cmd/zed/zed.d/all-debug.sh \
- $(top_srcdir)/cmd/zed/zed.d/all-syslog.sh \
- $(top_srcdir)/cmd/zed/zed.d/checksum-notify.sh \
- $(top_srcdir)/cmd/zed/zed.d/checksum-spare.sh \
- $(top_srcdir)/cmd/zed/zed.d/data-notify.sh \
- $(top_srcdir)/cmd/zed/zed.d/generic-notify.sh \
- $(top_srcdir)/cmd/zed/zed.d/io-notify.sh \
- $(top_srcdir)/cmd/zed/zed.d/io-spare.sh \
- $(top_srcdir)/cmd/zed/zed.d/resilver.finish-notify.sh \
- $(top_srcdir)/cmd/zed/zed.d/scrub.finish-notify.sh
+ zed.d/all-debug.sh \
+ zed.d/all-syslog.sh \
+ zed.d/checksum-notify.sh \
+ zed.d/checksum-spare.sh \
+ zed.d/data-notify.sh \
+ zed.d/generic-notify.sh \
+ zed.d/io-notify.sh \
+ zed.d/io-spare.sh \
+ zed.d/resilver.finish-notify.sh \
+ zed.d/scrub.finish-notify.sh
zedconfdefaults = \
all-syslog.sh \