diff options
author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-09-30 08:25:50 +0000 |
---|---|---|
committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-09-30 08:25:50 +0000 |
commit | 0393f5c16e05838545024c6d206d83a18fdcce1b (patch) | |
tree | fe6072382da4b1d2a1cfe6296c9a95bb61862eaa | |
parent | f18b720f9a960d701f8d32a199e8b2a3975f9d6c (diff) | |
download | busybox-w32-0393f5c16e05838545024c6d206d83a18fdcce1b.tar.gz busybox-w32-0393f5c16e05838545024c6d206d83a18fdcce1b.tar.bz2 busybox-w32-0393f5c16e05838545024c6d206d83a18fdcce1b.zip |
- remove duplicate entry of resolve.c in BLKID_SRC
- use the sourcedir to look for includes rather than the builddir
git-svn-id: svn://busybox.net/trunk/busybox@11701 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | e2fsprogs/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index f7dbba30f..5def023f8 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in | |||
@@ -7,11 +7,12 @@ | |||
7 | E2FSPROGS_AR:=e2fsprogs.a | 7 | E2FSPROGS_AR:=e2fsprogs.a |
8 | 8 | ||
9 | E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs | 9 | E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs |
10 | E2FSPROGS_INC:=$(top_sourcedir)/e2fsprogs | ||
10 | 11 | ||
11 | E2FSPROGS_CFLAGS := -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)/e2fsbb.h | 12 | E2FSPROGS_CFLAGS := -I$(E2FSPROGS_INC) -include $(E2FSPROGS_INC)/e2fsbb.h |
12 | 13 | ||
13 | BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \ | 14 | BLKID_SRC := cache.c dev.c devname.c devno.c blkid_getsize.c \ |
14 | probe.c read.c resolve.c save.c tag.c resolve.c | 15 | probe.c read.c resolve.c save.c tag.c |
15 | BLKID_SRCS := $(patsubst %,blkid/%, $(BLKID_SRC)) | 16 | BLKID_SRCS := $(patsubst %,blkid/%, $(BLKID_SRC)) |
16 | BLKID_OBJS := $(patsubst %.c,%.o, $(BLKID_SRCS)) | 17 | BLKID_OBJS := $(patsubst %.c,%.o, $(BLKID_SRCS)) |
17 | 18 | ||