[PATCH] xfstests: fix up aio-dio install & build

[PATCH] xfstests: fix up aio-dio install & build

[Eric Sandeen]

commit bd53c922 added src/aio-dio-regress to the top-level
Makefile so that it would get caught on make install, but
doing this unconditionally means that we tried to build that
subdir even if libaio headers weren't found.

Fix this up to do a properly chained make install through
the subdirs...

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/Makefile b/Makefile
index 4dcb779..b017580 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
 	check.log check.time
 
 LIB_SUBDIRS = include lib
-TOOL_SUBDIRS = ltp src src/aio-dio-regress m4
+TOOL_SUBDIRS = ltp src m4
 
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
 
diff --git a/src/Makefile b/src/Makefile
index 7b01754..9f19605 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -135,8 +135,11 @@ open_unlink: open_unlink.o $(LIBHANDLE)
 
 endif
 
-install:
+install: $(addsuffix -install,$(SUBDIRS))
 	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 755 fill2attr fill2fs fill2fs_check scaleread.sh $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 644 dumpfile $(PKG_LIB_DIR)/src
+
+%-install:
+	$(MAKE) -C $* install

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: fix up aio-dio install & build

[Christoph Hellwig]

On Wed, Dec 02, 2009 at 01:35:29PM -0600, Eric Sandeen wrote:
> commit bd53c922 added src/aio-dio-regress to the top-level
> Makefile so that it would get caught on make install, but
> doing this unconditionally means that we tried to build that
> subdir even if libaio headers weren't found.
> 
> Fix this up to do a properly chained make install through
> the subdirs...

Looks good, and also fits the other userspace packages better.


Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs