Skip to contentSkip to conversation

xfstests: fix up aio-dio install & build

PATCH In review Eric Sandeen 2 participants 2 messages Dec 2, 2009 – Dec 3, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: fix up aio-dio install & build

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...

---

Makefile +1 -1
index 4dcb779..b017580 100644
@@ -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)
 
src/Makefile +4 -1
index 7b01754..9f19605 100644
@@ -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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · 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...

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

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs