OK, everything builds now. My initial intent was to place all of

the directories at the top level but that proved troublesome.  The
kernel buildsystem and autoconf were conflicting too much.  To 
resolve the issue I moved the kernel bits in to a modules directory
which can then only use the kernel build system.  We just pass 
along the likely make targets to the kernel build system.



git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@11 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c

Makefile.am

@@ -1,9 +1,10 @@
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = src include scripts
+SUBDIRS = lib cmd modules include scripts
 CONFIG_CLEAN_FILES =  aclocal.m4 config.guess config.sub
 CONFIG_CLEAN_FILES += depcomp install-sh missing mkinstalldirs
 EXTRA_DIST = autogen.sh
 
 rpms: dist Makefile
 	rpmbuild -ta $(distdir).tar.gz
+

cmd/Makefile.am

@@ -2,4 +2,4 @@ AM_CFLAGS = -g -O2 -W -Wall -Wstrict-prototypes -Wshadow
 INCLUDES = -I$(top_srcdir)/include
 sbin_PROGRAMS = splat
 splat_SOURCES = splat.c
-splat_LDFLAGS = $(top_builddir)/src/lib/libcommon.la
+splat_LDFLAGS = $(top_builddir)/lib/libcommon.la

configure.ac

@@ -109,11 +109,11 @@ AC_SUBST(KERNELCPPFLAGS)
 AC_SUBST(KERNELCFLAGS)
 
 AC_CONFIG_FILES([ Makefile
-                  src/Makefile
-                  src/lib/Makefile
-                  src/cmd/Makefile
-                  src/spl/Makefile
-                  src/splat/Makefile
+                  lib/Makefile
+                  cmd/Makefile
+                  modules/Makefile
+                  modules/spl/Makefile
+                  modules/splat/Makefile
                   include/Makefile
                   scripts/Makefile
                   scripts/spl.spec

modules/Makefile.in

@@ -0,0 +1,12 @@
+subdir-m += spl
+subdir-m += splat
+
+all:
+	$(MAKE) -C @kernelsrc@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules
+
+install uninstall clean distclean maintainer-clean distdir:
+	$(MAKE) -C @kernelsrc@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+
+
+
+

modules/spl/Makefile.in

@@ -13,13 +13,12 @@ spl-objs += linux-kmem.o
 spl-objs += linux-thread.o
 spl-objs += linux-taskq.o
 spl-objs += linux-rwlock.o
+spl-objs += linux-generic.o
 
 splmodule := spl.ko
 splmoduledir := @kmoduledir@/kernel/lib/
 
-all: all-spec
-
-install: all
+install:
 	mkdir -p $(DESTDIR)$(splmoduledir)
 	$(INSTALL) -m 644 $(splmodule) $(DESTDIR)$(splmoduledir)/$(splmodule)
 	-/sbin/depmod -a
@@ -39,6 +38,3 @@ maintainer-clean: distclean
 
 distdir: $(DISTFILES)
 	cp -p $(DISTFILES) $(distdir)
-
-all-spec:
-	$(MAKE) -C @kernelsrc@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules

modules/splat/Makefile.in

@@ -23,9 +23,7 @@ splat-objs += splat-time.o
 splatmodule := splat.ko
 splatmoduledir := @kmoduledir@/kernel/lib/
 
-all: all-spec
-
-install: all
+install:
 	mkdir -p $(DESTDIR)$(splatmoduledir)
 	$(INSTALL) -m 644 $(splatmodule) $(DESTDIR)$(splatmoduledir)/$(splatmodule)
 	-/sbin/depmod -a
@@ -45,6 +43,3 @@ maintainer-clean: distclean
 
 distdir: $(DISTFILES)
 	cp -p $(DISTFILES) $(distdir)
-
-all-spec:
-	$(MAKE) -C @kernelsrc@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules

src/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = lib cmd spl splat