On Mon, Jul 08, 2013 at 06:46:07PM +0200, David Sterba wrote:
> On Sat, Jul 06, 2013 at 05:22:31PM +0900, Kusanagi Kouichi wrote:
> > Some files don't compile because of insufficient prerequisite.
> >
> > $ make btrfs
> > ...
> > [CC] btrfs.o
> > btrfs.c:24:21: fatal error: version.h: No such file or directory
> > #include "version.h"
> > ^
> > compilation terminated.
> > make: *** [btrfs.o] Error 1
>
> Works great, thanks. I've noticed that DEPFLAGS is now unused and
> removed it.
Two more small things: the files were previously named .something.o.d and
now they're something.d .
* .gitignore needs to be updated
* I'd prefer to keep the suffix .o.d, the leading . has go away due to
the macro tricks
I'll fold the following patch if you don't mind
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
*.o
*.static.o
-.*.o.d
+*.o.d
version.h
version
man/*.gz
diff --git a/Makefile b/Makefile
index 70880bc..849e3fe 100644
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@ else
check = true
endif
-%.d: %.c
- $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.d=.o) -MT $(@:.d=.static.o) -MT $@
$(AM_CFLAGS) $(CFLAGS) $<
+%.o.d: %.c
+ $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT
$@ $(AM_CFLAGS) $(CFLAGS) $<
.c.o:
$(Q)$(check) $<
@@ -186,7 +186,7 @@ install-man:
clean :
@echo "Cleaning"
- $(Q)rm -f $(progs) cscope.out *.o *.d btrfs-convert btrfs-image
btrfs-select-super \
+ $(Q)rm -f $(progs) cscope.out *.o *.o.d btrfs-convert btrfs-image
btrfs-select-super \
btrfs-zero-log btrfstune dir-test ioctl-test quick-test send-test
btrfsck \
btrfs.static mkfs.btrfs.static btrfs-calc-size \
version.h \
@@ -205,5 +205,5 @@ install: $(libs) $(progs) install-man
$(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
ifneq ($(MAKECMDGOALS),clean)
--include $(objects:.o=.d) $(cmd-objects:.o=.d) $(subst .btrfs,, $(filter-out
btrfsck.d, $(progs:=.d)))
+-include $(objects:.o=.o.d) $(cmd-objects:.o=.o.d) $(subst .btrfs,,
$(filter-out btrfsck.o.d, $(progs:=.o.d)))
endif
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
