From: Theodore Ts'o Date: Thu, 11 Sep 2014 23:15:22 +0000 (-0400) Subject: lib/ext2fs: fix Makefile to avoid a build splat when building without VPATH X-Git-Tag: v1.43-WIP-2015-05-18~182 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a2c664ae908dc7d4b545013e669b1cbf76c1e79c;p=tools%2Fe2fsprogs.git lib/ext2fs: fix Makefile to avoid a build splat when building without VPATH When building in the source tree, the order of the includes caused the compiling of debugfs/journal.c while in the lib/ext2fs directory to find the version in lib/ext2fs instead of the desired version in e2fsck/jfs_user.h. We need to eventually get rid of this whole mess and have only one jfs_user.h and build the journal-related functions once in an internal library which is used only by e2fsprogs progams. Signed-off-by: Theodore Ts'o Reported-by: "Darrick J. Wong" --- diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 31040dd..45e733c 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -7,7 +7,7 @@ INSTALL = @INSTALL@ DEPEND_CFLAGS = -I$(top_srcdir)/debugfs -I$(srcdir)/../../e2fsck -DDEBUGFS # This nastyness is needed because of jfs_user.h hackery; when we finally # clean up this mess, we should be able to drop it -DEBUGFS_CFLAGS = $(ALL_CFLAGS) -I$(srcdir)/../../e2fsck -DDEBUGFS +DEBUGFS_CFLAGS = -I$(srcdir)/../../e2fsck $(ALL_CFLAGS) -DDEBUGFS @MCONFIG@