Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+7 -7
View File
@@ -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)