X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=ltp%2FMakefile;h=5bea492789f3f92a88a21b76808e284f5a7a4e85;hp=9c0ba1efbcda20a0d4b548632ed09a350ccc61f4;hb=4544179a64dcdef96b59c072baf3ef33e1b211fc;hpb=de6d86177ff8499dc365c0c0d56abf0e66be4672

diff --git a/ltp/Makefile b/ltp/Makefile
index 9c0ba1ef..5bea4927 100644
--- a/ltp/Makefile
+++ b/ltp/Makefile
@@ -6,46 +6,45 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 TARGETS = doio fsstress fsx growfiles iogen
+SCRIPTS = rwtest.sh
 CFILES = $(TARGETS:=.c)
 HFILES = doio.h
 LDIRT = $(TARGETS)
 LCFLAGS = -DXFS
-IFLAG = -I$(TOPDIR)/src #Used for including $(TOPDIR)/src/global.h
+LCFLAGS += -I$(TOPDIR)/src #Used for including $(TOPDIR)/src/global.h
 
 ifeq ($(HAVE_ATTR_LIST), true)
 LCFLAGS += -DHAVE_ATTR_LIST
+LLDLIBS += $(LIBATTR)
 endif
 ifeq ($(PKG_PLATFORM),irix)
 LCFLAGS += -DHAVE_ATTR_LIST
+LLDLIBS += $(LIBATTR)
 endif
 
 ifeq ($(HAVE_AIO), true)
 TARGETS += aio-stress
 LCFLAGS += -DAIO
-LIBAIO = -laio -lpthread
+LLDLIBS += -laio -lpthread
 endif
 
-default: $(TARGETS)
-
-include $(BUILDRULES)
-LINKTEST = $(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS)
+ifeq ($(HAVE_FALLOCATE), true)
+LCFLAGS += -DFALLOCATE
+endif
 
-doio: doio.c $(LIBTEST)
-	$(LINKTEST) $(LIBTEST) $(IFLAG)
+default: depend $(TARGETS)
 
-fsstress: fsstress.c $(LIBATTR) $(LIBTEST)
-	$(LINKTEST) $(LIBATTR) $(LIBTEST) $(LDLIBS)  $(IFLAG)
+depend: .dep
 
-fsx: fsx.c
-	$(LINKTEST) $(LIBAIO) $(LDLIBS)  $(IFLAG)
+include $(BUILDRULES)
 
-growfiles: growfiles.c $(LIBTEST)
-	$(LINKTEST) $(LIBTEST) $(LDLIBS)  $(IFLAG)
+$(TARGETS): $(LIBTEST)
+	@echo "    [CC]    $@"
+	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBTEST)
 
-iogen: iogen.c $(LIBTEST)
-	$(LINKTEST) $(LIBTEST)  $(IFLAG)
+install: default
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/ltp
+	$(LTINSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/ltp
+	$(INSTALL) -m 755 $(SCRIPTS) $(PKG_LIB_DIR)/ltp
 
-ifeq ($(HAVE_AIO), true)
-aio-stress: aio-stress.c
-	$(LINKTEST) $(LIBAIO) $(LDLIBS)
-endif
+-include .dep