On Thu, Sep 11, 2014 at 02:53:43PM -0400, Theodore Ts'o wrote: > On Mon, Sep 08, 2014 at 04:12:42PM -0700, Darrick J. Wong wrote: > > +recovery.o: $(srcdir)/../e2fsck/recovery.c > > + cp $(srcdir)/../e2fsck/recovery.c $(srcdir)/recovery.c > > + $(E) " CC $@" > > + $(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \ > > + $(srcdir)/recovery.c -DDEBUGFS -o $@ > > + > > +revoke.o: $(srcdir)/../e2fsck/revoke.c > > + cp $(srcdir)/../e2fsck/revoke.c $(srcdir)/revoke.c > > + $(E) " CC $@" > > + $(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \ > > + $(srcdir)/revoke.c -DDEBUGFS -o $@ > > + > > Please don't copy the .c files around. That just invites confusion > because git will show that there are new files, debugfs/recovery.c and > debugfs/revoke.c, and some future unwary developer might try to edit > recovery.c and revoke.c in the debugfs directory. > > Much better to do it this way: > > recovery.o: $(srcdir)/../e2fsck/recovery.c > $(E) " CC $@" > $(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \ > $(srcdir)/../e2fsck/recovery.c -DDEBUGFS -o $@ > > revoke.o: $(srcdir)/../e2fsck/revoke.c > $(E) " CC $@" > $(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \ > $(srcdir)/../e2fsck/revoke.c -DDEBUGFS -o $@ > > I'll fix this up when I apply this patch. Will that pick up debugfs/jfs_user.h, though? I originally tried it this way but gcc seemed to want to pull in the jfs_user.h from e2fsck/. --D > > Cheers, > > - Ted > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
