commit bd53c922 added src/aio-dio-regress to the top-level
authorEric Sandeen <sandeen@sandeen.net>
Thu, 3 Dec 2009 16:30:11 +0000 (10:30 -0600)
committerEric Sandeen <sandeen@sandeen.net>
Thu, 3 Dec 2009 16:30:11 +0000 (10:30 -0600)
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Makefile
src/Makefile

index 4dcb779..b017580 100644 (file)
--- 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)
 
index 7b01754..9f19605 100644 (file)
@@ -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