Fixed merge problems

[xfstests-dev.git] / ltp / Makefile

diff --git a/ltp/Makefile b/ltp/Makefile
index 1a5c4aaecf18af4d8e724b0357aec80c16349a01..ce359b6a552000ddd797804a8b62d3b67f9aba78 100644 (file)
--- a/ltp/Makefile
+++ b/ltp/Makefile
@@ -38,26 +38,26 @@ CFILES = $(TARGETS:=.c)
 HFILES = doio.h
 LDIRT = $(TARGETS)
 LCFLAGS = -DXFS
-
+IFLAG = -I$(TOPDIR)/src #Used for including $(TOPDIR)/src/global.h
 #LCFLAGS += -DAIO
 #LIBAIO =-laio
 
 default: $(TARGETS)
 
-include $(BUILDRULES)
+include $(BUILDRULES) 
 LINKTEST = $(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS)
 
 doio: doio.c $(LIBTEST)
-       $(LINKTEST) $(LIBTEST)
+       $(LINKTEST) $(LIBTEST) $(IFLAG)
 
 fsstress: fsstress.c $(LIBATTR) $(LIBTEST)
-       $(LINKTEST) $(LIBATTR) $(LIBTEST) $(LDLIBS)
+       $(LINKTEST) $(LIBATTR) $(LIBTEST) $(LDLIBS)  $(IFLAG)
 
 fsx: fsx.c
-       $(LINKTEST) $(LIBAIO) $(LDLIBS)
+       $(LINKTEST) $(LIBAIO) $(LDLIBS)  $(IFLAG)
 
 growfiles: growfiles.c $(LIBTEST)
-       $(LINKTEST) $(LIBTEST) $(LDLIBS)
+       $(LINKTEST) $(LIBTEST) $(LDLIBS)  $(IFLAG)
 
 iogen: iogen.c $(LIBTEST)
-       $(LINKTEST) $(LIBTEST)
+       $(LINKTEST) $(LIBTEST)  $(IFLAG)