svn commit: trunk/busybox: e2fsprogs e2fsprogs/blkid e2fsprogs/ext etc...

vda at busybox.net vda at busybox.net
Wed Oct 11 14:24:43 PDT 2006


Author: vda
Date: 2006-10-11 14:24:42 -0700 (Wed, 11 Oct 2006)
New Revision: 16365

Log:
build system: fix build in separate obj tree


Modified:
   trunk/busybox/Makefile
   trunk/busybox/e2fsprogs/Kbuild
   trunk/busybox/e2fsprogs/blkid/Kbuild
   trunk/busybox/e2fsprogs/ext2fs/Kbuild


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-10-11 20:59:02 UTC (rev 16364)
+++ trunk/busybox/Makefile	2006-10-11 21:24:42 UTC (rev 16365)
@@ -399,6 +399,7 @@
 export KBUILD_DEFCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
+	$(Q)mkdir -p include
 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
 

Modified: trunk/busybox/e2fsprogs/Kbuild
===================================================================
--- trunk/busybox/e2fsprogs/Kbuild	2006-10-11 20:59:02 UTC (rev 16364)
+++ trunk/busybox/e2fsprogs/Kbuild	2006-10-11 21:24:42 UTC (rev 16365)
@@ -13,4 +13,4 @@
 lib-$(CONFIG_MKE2FS)     += mke2fs.o util.o
 lib-$(CONFIG_TUNE2FS)    += tune2fs.o util.o
 
-CFLAGS += -include e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h

Modified: trunk/busybox/e2fsprogs/blkid/Kbuild
===================================================================
--- trunk/busybox/e2fsprogs/blkid/Kbuild	2006-10-11 20:59:02 UTC (rev 16364)
+++ trunk/busybox/e2fsprogs/blkid/Kbuild	2006-10-11 21:24:42 UTC (rev 16365)
@@ -13,11 +13,11 @@
 lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \
                    probe.o read.o resolve.o save.o tag.o list.o
 
-CFLAGS_dev.o := -include include/busybox.h
-CFLAGS_devname.o := -include include/busybox.h
-CFLAGS_devno.o := -include include/busybox.h
-CFLAGS_blkid_getsize.o := -include include/busybox.h
-CFLAGS_probe.o := -include include/busybox.h
-CFLAGS_save.o := -include include/busybox.h
-CFLAGS_tag.o := -include include/busybox.h
-CFLAGS_list.o := -include include/busybox.h
+CFLAGS_dev.o     := -include $(srctree)/include/busybox.h
+CFLAGS_devname.o := -include $(srctree)/include/busybox.h
+CFLAGS_devno.o   := -include $(srctree)/include/busybox.h
+CFLAGS_blkid_getsize.o := -include $(srctree)/include/busybox.h
+CFLAGS_probe.o   := -include $(srctree)/include/busybox.h
+CFLAGS_save.o    := -include $(srctree)/include/busybox.h
+CFLAGS_tag.o     := -include $(srctree)/include/busybox.h
+CFLAGS_list.o    := -include $(srctree)/include/busybox.h

Modified: trunk/busybox/e2fsprogs/ext2fs/Kbuild
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/Kbuild	2006-10-11 20:59:02 UTC (rev 16364)
+++ trunk/busybox/e2fsprogs/ext2fs/Kbuild	2006-10-11 21:24:42 UTC (rev 16365)
@@ -20,4 +20,4 @@
                    dirhash.o version.o flushb.o unlink.o check_desc.o valid_blk.o \
                    ext_attr.o bmap.o dblist_dir.o ext2fs_inline.o swapfs.o
 
-CFLAGS += -include e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h



More information about the busybox-cvs mailing list