summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorRob Landley2005-08-24 00:41:52 +0000
committerRob Landley2005-08-24 00:41:52 +0000
commite1d9633e20d8f3153602249441df916cd31f303f (patch)
tree0e9ce3743640ad5f49669e3e15e8d5a04abf1a3c /e2fsprogs
parenta937640bff9ad496e5c41d93918bbc7e51b2068e (diff)
downloadbusybox-e1d9633e20d8f3153602249441df916cd31f303f.zip
busybox-e1d9633e20d8f3153602249441df916cd31f303f.tar.gz
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 $@'
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/Makefile.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index dfdf77a..ed307c1 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 $@ $<