From e1d9633e20d8f3153602249441df916cd31f303f Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 24 Aug 2005 00:41:52 +0000 Subject: Bernhard Fischer submitted a couple of Makefile patches: - Fix building out-of-tree - remove duplicate rule in toplevel Makefile - peruse make's builtin notion of `dirname $@' --- e2fsprogs/Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'e2fsprogs/Makefile.in') diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index dfdf77a65..ed307c1ea 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in @@ -18,12 +18,12 @@ # E2FSPROGS_AR:=e2fsprogs.a -ifndef $(E2FSPROGS_DIR) + E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/ -endif + srcdir=$(top_srcdir)/e2fsprogs -E2FSPROGS_CFLAGS := -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)e2fsbb.h +E2FSPROGS_CFLAGS := -I$(srcdir) -include $(srcdir)/e2fsbb.h BLKID_SRC := cache.c dev.c devname.c devno.c getsize.c llseek.c probe.c \ read.c resolve.c save.c tag.c resolve.c @@ -63,5 +63,7 @@ libraries-y+=$(E2FSPROGS_DIR)$(E2FSPROGS_AR) $(E2FSPROGS_DIR)$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y)) $(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y)) +# for e2p/*: check if the dir exists, dude $(E2FSPROGS_DIR)%.o: $(srcdir)/%.c + @[ -d $(@D) ] || mkdir -v $(@D) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $< -- cgit v1.2.3