diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-10-05 07:40:46 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-10-05 07:40:46 +0000 |
| commit | 5c071bcf2f6bc923b5d6779b3563d08b80a8949d (patch) | |
| tree | 2f116d1bedfb7bddc5d9be9c9d1829944703f388 /e2fsprogs | |
| parent | dc2510327b43ab5ce18c1752304015fad4663bad (diff) | |
| download | busybox-w32-5c071bcf2f6bc923b5d6779b3563d08b80a8949d.tar.gz busybox-w32-5c071bcf2f6bc923b5d6779b3563d08b80a8949d.tar.bz2 busybox-w32-5c071bcf2f6bc923b5d6779b3563d08b80a8949d.zip | |
- fix building out-of-tree;
to test, checkout the source (let's assume /scratch/src/busybox), then
mkdir /tmp/bb ; cd /tmp/bb
make top_srcdir=/scratch/src/busybox O="$(pwd)" -f /scratch/src/busybox/Makefile allyesconfig check
- default to O=$(pwd) if no O was specified. Now you can just specify
the top_srcdir (without O=/somewhere) to create the obj-tree in pwd.
- make "make configtarget buildtarget" work. Previously this didn't
work due to how HAVE_DOT_CONFIG was evaluated. Two separate steps were
needed before, e.g. make config ; make busybox.
- remove some unneeded variables from Rules.mak (BB_SRC_DIR from Mr.
ldoolitt@recycle.lbl) which suggest that the stuff fixed above
didn't work before.
- move selinux libraries to where they belong (from Makefile to Rules.mak)
- update the docs to mention svn instead of cvs and provide an example
for building out-of-tree in INSTALL.
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/Makefile | 2 | ||||
| -rw-r--r-- | e2fsprogs/Makefile.in | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile index a4b0b785f..e6299e6dd 100644 --- a/e2fsprogs/Makefile +++ b/e2fsprogs/Makefile | |||
| @@ -8,8 +8,8 @@ top_srcdir=.. | |||
| 8 | top_builddir=.. | 8 | top_builddir=.. |
| 9 | srcdir=$(top_srcdir)/e2fsprogs | 9 | srcdir=$(top_srcdir)/e2fsprogs |
| 10 | E2FSPROGS_DIR:=./ | 10 | E2FSPROGS_DIR:=./ |
| 11 | include $(top_builddir)/Rules.mak | ||
| 12 | include $(top_builddir)/.config | 11 | include $(top_builddir)/.config |
| 12 | include $(top_builddir)/Rules.mak | ||
| 13 | include Makefile.in | 13 | include Makefile.in |
| 14 | all: $(libraries-y) | 14 | all: $(libraries-y) |
| 15 | -include $(top_builddir)/.depend | 15 | -include $(top_builddir)/.depend |
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 0353a161f..46a684ee7 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in | |||
| @@ -39,7 +39,18 @@ UUID_SRC := compare.c gen_uuid.c pack.c parse.c unpack.c unparse.c \ | |||
| 39 | UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) | 39 | UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) |
| 40 | UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) | 40 | UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) |
| 41 | 41 | ||
| 42 | E2FSPROGS-:= | 42 | # for building out-of-tree we need to make sure that the directories to hold |
| 43 | # the object tree are created | ||
| 44 | $(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): | ||
| 45 | mkdir -p "$@" | ||
| 46 | |||
| 47 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):$(E2FSPROGS_DIR)/blkid | ||
| 48 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):$(E2FSPROGS_DIR)/e2fsck | ||
| 49 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):$(E2FSPROGS_DIR)/e2p | ||
| 50 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):$(E2FSPROGS_DIR)/ext2fs | ||
| 51 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):$(E2FSPROGS_DIR)/uuid | ||
| 52 | |||
| 53 | E2FSPROGS-y:= | ||
| 43 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) | 54 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) |
| 44 | E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) | 55 | E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) |
| 45 | E2FSPROGS-$(CONFIG_FSCK) += fsck.o base_device.o $(BLKID_OBJS) $(UUID_OBJS) | 56 | E2FSPROGS-$(CONFIG_FSCK) += fsck.o base_device.o $(BLKID_OBJS) $(UUID_OBJS) |
| @@ -53,5 +64,6 @@ libraries-y+=$(E2FSPROGS_DIR)/$(E2FSPROGS_AR) | |||
| 53 | $(E2FSPROGS_DIR)/$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) | 64 | $(E2FSPROGS_DIR)/$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) |
| 54 | $(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) | 65 | $(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) |
| 55 | 66 | ||
| 56 | $(E2FSPROGS_DIR)/%.o: $(E2FSPROGS_DIR)/%.c | 67 | $(E2FSPROGS_DIR)/%.o: $(subst $(top_builddir),$(top_srcdir),$(E2FSPROGS_DIR)/%.c) |
| 57 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $< | 68 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $< |
| 69 | |||