projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfio
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index fe22741e940e51628934e2f3900e66dd9356fbda..5165cd9ff38dd1cbb0e59b933c1dfafc124fd0b8 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-106,7
+106,7
@@
all: .depend $(PROGS) $(SCRIPTS) FORCE
.PHONY: FORCE cscope
FIO-VERSION-FILE: FORCE
.PHONY: FORCE cscope
FIO-VERSION-FILE: FORCE
- @$(SHELL
_PATH
) ./FIO-VERSION-GEN
+ @$(SHELL) ./FIO-VERSION-GEN
-include FIO-VERSION-FILE
CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
-include FIO-VERSION-FILE
CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
@@
-162,7
+162,7
@@
gfio: $(GFIO_OBJS)
$(PROGS): .depend
clean: FORCE
$(PROGS): .depend
clean: FORCE
- -rm -f .depend $(GFIO_OBJS
) $(FIO_
OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE
+ -rm -f .depend $(GFIO_OBJS
)$(
OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE
cscope:
@cscope -b -R
cscope:
@cscope -b -R