diff options
| author | Bernhard Reutner-Fischer | 2005-10-05 07:40:46 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2005-10-05 07:40:46 +0000 |
| commit | 5c071bcf2f6bc923b5d6779b3563d08b80a8949d (patch) | |
| tree | 2f116d1bedfb7bddc5d9be9c9d1829944703f388 /e2fsprogs | |
| parent | dc2510327b43ab5ce18c1752304015fad4663bad (diff) | |
| download | busybox-5c071bcf2f6bc923b5d6779b3563d08b80a8949d.zip busybox-5c071bcf2f6bc923b5d6779b3563d08b80a8949d.tar.gz | |
- 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 a4b0b78..e6299e6 100644 --- a/e2fsprogs/Makefile +++ b/e2fsprogs/Makefile @@ -8,8 +8,8 @@ top_srcdir=.. top_builddir=.. srcdir=$(top_srcdir)/e2fsprogs E2FSPROGS_DIR:=./ -include $(top_builddir)/Rules.mak include $(top_builddir)/.config +include $(top_builddir)/Rules.mak include Makefile.in all: $(libraries-y) -include $(top_builddir)/.depend diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 0353a16..46a684e 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 \ UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) -E2FSPROGS-:= +# for building out-of-tree we need to make sure that the directories to hold +# the object tree are created +$(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): + mkdir -p "$@" + +$(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):$(E2FSPROGS_DIR)/blkid +$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):$(E2FSPROGS_DIR)/e2fsck +$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):$(E2FSPROGS_DIR)/e2p +$(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):$(E2FSPROGS_DIR)/ext2fs +$(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):$(E2FSPROGS_DIR)/uuid + +E2FSPROGS-y:= E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) E2FSPROGS-$(CONFIG_FSCK) += fsck.o base_device.o $(BLKID_OBJS) $(UUID_OBJS) @@ -53,5 +64,6 @@ libraries-y+=$(E2FSPROGS_DIR)/$(E2FSPROGS_AR) $(E2FSPROGS_DIR)/$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) $(AR) $(ARFLAGS) $@ $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y)) -$(E2FSPROGS_DIR)/%.o: $(E2FSPROGS_DIR)/%.c +$(E2FSPROGS_DIR)/%.o: $(subst $(top_builddir),$(top_srcdir),$(E2FSPROGS_DIR)/%.c) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $< + |