svn commit: [26157] trunk/busybox/applets

vda at busybox.net vda at busybox.net
Sun Apr 19 12:15:51 UTC 2009


Author: vda
Date: 2009-04-19 12:15:51 +0000 (Sun, 19 Apr 2009)
New Revision: 26157

Log:
hopefully fix out-of-tree build broken by 26139



Modified:
   trunk/busybox/applets/Kbuild


Changeset:
Modified: trunk/busybox/applets/Kbuild
===================================================================
--- trunk/busybox/applets/Kbuild	2009-04-19 01:27:20 UTC (rev 26156)
+++ trunk/busybox/applets/Kbuild	2009-04-19 12:15:51 UTC (rev 26157)
@@ -13,21 +13,27 @@
 always:= $(hostprogs-y)
 
 # Generated files need additional love
-# NB: __srctree is either empty or "srctree/"
-# using it instead of srctree decreases amount of rebuilds
+
+# This trick decreases amount of rebuilds
 # if tree is merely renamed/copied
+ifeq ($(src),$(obj))
+srctree_slash =
+else
+srctree_slash = $(srctree)/
+endif
 
-HOSTCFLAGS_usage.o = -I$(__srctree)include
 
+HOSTCFLAGS_usage.o = -I$(srctree_slash)include
+
 applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
-applets/usage:         .config $(__srctree)applets/usage_compressed
+applets/usage:         .config $(srctree_slash)applets/usage_compressed
 applets/applet_tables: .config
 
 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
-      cmd_gen_usage_compressed = $(__srctree)applets/usage_compressed include/usage_compressed.h applets
+      cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
 
-include/usage_compressed.h: applets/usage $(__srctree)applets/usage_compressed
+include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compressed
 	$(call cmd,gen_usage_compressed)
 
 quiet_cmd_gen_applet_tables = GEN     include/applet_tables.h



More information about the busybox-cvs mailing list