aboutsummaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-09-02 12:12:39 -0700
committerBrian Behlendorf <[email protected]>2010-09-05 21:49:05 -0700
commita7958f7eef5ba55987810336d887437767941d26 (patch)
tree58f613c18dcd1b6e71991c2dd5d3ab47e8380c92 /module
parentd8a1b739359b04f016e2b81844a29c4d0de60bd8 (diff)
Support custom build directories
One of the neat tricks an autoconf style project is capable of is allow configurion/building in a directory other than the source directory. The major advantage to this is that you can build the project various different ways while making changes in a single source tree. For example, this project is designed to work on various different Linux distributions each of which work slightly differently. This means that changes need to verified on each of those supported distributions perferably before the change is committed to the public git repo. Using nfs and custom build directories makes this much easier. I now have a single source tree in nfs mounted on several different systems each running a supported distribution. When I make a change to the source base I suspect may break things I can concurrently build from the same source on all the systems each in their own subdirectory. wget -c http://github.com/downloads/behlendorf/spl/spl-x.y.z.tar.gz tar -xzf spl-x.y.z.tar.gz cd spl-x-y-z ------------------------- run concurrently ---------------------- <ubuntu system> <fedora system> <debian system> <rhel6 system> mkdir ubuntu mkdir fedora mkdir debian mkdir rhel6 cd ubuntu cd fedora cd debian cd rhel6 ../configure ../configure ../configure ../configure make make make make make check make check make check make check This is something the project has almost supported for a long time but finishing this support should save me lots of time.
Diffstat (limited to 'module')
-rw-r--r--module/Makefile.in12
-rw-r--r--module/spl/Makefile.in40
-rw-r--r--module/splat/Makefile.in32
3 files changed, 44 insertions, 40 deletions
diff --git a/module/Makefile.in b/module/Makefile.in
index caa403228..70a33ec14 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -12,23 +12,23 @@ clean:
if [ -f Module.markers ]; then $(RM) Module.markers; fi
modules_install:
- # Install the kernel modules
+ @# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
INSTALL_MOD_PATH=$(DESTDIR) \
INSTALL_MOD_DIR=addon/spl $@
- find ${DESTDIR}/lib/modules/ -name 'modules.*' | xargs ${RM}
- sysmap=${DESTDIR}/boot/System.map-@LINUX_VERSION@; \
+ find $(DESTDIR)/lib/modules/ -name 'modules.*' | xargs $(RM)
+ sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
- # Uninstall the kernel modules
- $(RM) -R ${DESTDIR}/lib/modules/@LINUX_VERSION@/addon/spl
+ @# Uninstall the kernel modules
+ $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/spl
distdir:
list='$(subdir-m)'; for subdir in $$list; do \
- (find $$subdir -name '*.c' -o -name '*.h' | \
+ (find @top_srcdir@/module/$$subdir -name '*.c' -o -name '*.h' |\
xargs /bin/cp -t $$distdir/$$subdir); \
done
diff --git a/module/spl/Makefile.in b/module/spl/Makefile.in
index ad29af406..5ee9b0167 100644
--- a/module/spl/Makefile.in
+++ b/module/spl/Makefile.in
@@ -1,26 +1,28 @@
# Makefile.in for spl kernel module
MODULES := spl
-EXTRA_CFLAGS = @KERNELCPPFLAGS@
+EXTRA_CFLAGS = @KERNELCPPFLAGS@
+EXTRA_CFLAGS += -I@abs_top_srcdir@/include
+EXTRA_CFLAGS += -include @abs_top_builddir@/spl_config.h
# Solaris porting layer module
obj-m := spl.o
-spl-objs += spl-debug.o
-spl-objs += spl-proc.o
-spl-objs += spl-kmem.o
-spl-objs += spl-thread.o
-spl-objs += spl-taskq.o
-spl-objs += spl-rwlock.o
-spl-objs += spl-vnode.o
-spl-objs += spl-err.o
-spl-objs += spl-time.o
-spl-objs += spl-kobj.o
-spl-objs += spl-module.o
-spl-objs += spl-generic.o
-spl-objs += spl-atomic.o
-spl-objs += spl-mutex.o
-spl-objs += spl-kstat.o
-spl-objs += spl-condvar.o
-spl-objs += spl-xdr.o
-spl-objs += spl-cred.o
+spl-objs += @top_srcdir@/module/spl/spl-debug.o
+spl-objs += @top_srcdir@/module/spl/spl-proc.o
+spl-objs += @top_srcdir@/module/spl/spl-kmem.o
+spl-objs += @top_srcdir@/module/spl/spl-thread.o
+spl-objs += @top_srcdir@/module/spl/spl-taskq.o
+spl-objs += @top_srcdir@/module/spl/spl-rwlock.o
+spl-objs += @top_srcdir@/module/spl/spl-vnode.o
+spl-objs += @top_srcdir@/module/spl/spl-err.o
+spl-objs += @top_srcdir@/module/spl/spl-time.o
+spl-objs += @top_srcdir@/module/spl/spl-kobj.o
+spl-objs += @top_srcdir@/module/spl/spl-module.o
+spl-objs += @top_srcdir@/module/spl/spl-generic.o
+spl-objs += @top_srcdir@/module/spl/spl-atomic.o
+spl-objs += @top_srcdir@/module/spl/spl-mutex.o
+spl-objs += @top_srcdir@/module/spl/spl-kstat.o
+spl-objs += @top_srcdir@/module/spl/spl-condvar.o
+spl-objs += @top_srcdir@/module/spl/spl-xdr.o
+spl-objs += @top_srcdir@/module/spl/spl-cred.o
diff --git a/module/splat/Makefile.in b/module/splat/Makefile.in
index 2f63b458a..724f824d5 100644
--- a/module/splat/Makefile.in
+++ b/module/splat/Makefile.in
@@ -2,22 +2,24 @@
MODULES := splat
EXTRA_CFLAGS = @KERNELCPPFLAGS@
+EXTRA_CFLAGS += -I@abs_top_srcdir@/include
+EXTRA_CFLAGS += -include @abs_top_builddir@/spl_config.h
# Solaris Porting LAyer Tests
obj-m := splat.o
-splat-objs += splat-ctl.o
-splat-objs += splat-kmem.o
-splat-objs += splat-taskq.o
-splat-objs += splat-random.o
-splat-objs += splat-mutex.o
-splat-objs += splat-condvar.o
-splat-objs += splat-thread.o
-splat-objs += splat-rwlock.o
-splat-objs += splat-time.o
-splat-objs += splat-vnode.o
-splat-objs += splat-kobj.o
-splat-objs += splat-atomic.o
-splat-objs += splat-list.o
-splat-objs += splat-generic.o
-splat-objs += splat-cred.o
+splat-objs += @top_srcdir@/module/splat/splat-ctl.o
+splat-objs += @top_srcdir@/module/splat/splat-kmem.o
+splat-objs += @top_srcdir@/module/splat/splat-taskq.o
+splat-objs += @top_srcdir@/module/splat/splat-random.o
+splat-objs += @top_srcdir@/module/splat/splat-mutex.o
+splat-objs += @top_srcdir@/module/splat/splat-condvar.o
+splat-objs += @top_srcdir@/module/splat/splat-thread.o
+splat-objs += @top_srcdir@/module/splat/splat-rwlock.o
+splat-objs += @top_srcdir@/module/splat/splat-time.o
+splat-objs += @top_srcdir@/module/splat/splat-vnode.o
+splat-objs += @top_srcdir@/module/splat/splat-kobj.o
+splat-objs += @top_srcdir@/module/splat/splat-atomic.o
+splat-objs += @top_srcdir@/module/splat/splat-list.o
+splat-objs += @top_srcdir@/module/splat/splat-generic.o
+splat-objs += @top_srcdir@/module/splat/splat-cred.o