svn commit: trunk/busybox

[vapier at busybox.net]

Author: vapier
Date: 2006-04-28 21:19:10 -0700 (Fri, 28 Apr 2006)
New Revision: 14960

Log:
compile.h is incorrect; create a new do_link.h and use that for bb_mkdep and usage

Modified:
   trunk/busybox/Makefile
   trunk/busybox/Rules.mak


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-04-29 04:12:36 UTC (rev 14959)
+++ trunk/busybox/Makefile	2006-04-29 04:19:10 UTC (rev 14960)
@@ -393,7 +393,7 @@
 
 # The nifty new dependency stuff
 scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
-	$(compile.h)
+	$(do_link.h)
 
 DEP_INCLUDES := include/bb_config.h
 
@@ -406,7 +406,7 @@
 endif
 
 scripts/usage: $(top_srcdir)/scripts/usage.c .config
-	$(compile.h) -I$(top_srcdir)/include
+	$(do_link.h) -I$(top_srcdir)/include
 
 DEP_INCLUDES += include/usage_compressed.h
 include/usage_compressed.h: .config scripts/usage

Modified: trunk/busybox/Rules.mak
===================================================================
--- trunk/busybox/Rules.mak	2006-04-29 04:12:36 UTC (rev 14959)
+++ trunk/busybox/Rules.mak	2006-04-29 04:19:10 UTC (rev 14960)
@@ -299,24 +299,28 @@
 pur_disp_compile.h = echo "  "HOSTCC $(show_objs)
 pur_disp_strip     = echo "  "STRIP $(show_objs)
 pur_disp_link      = echo "  "LINK $(show_objs)
+pur_disp_link.h    = echo "  "HOSTLINK $(show_objs)
 pur_disp_ar        = echo "  "AR $(ARFLAGS) $(show_objs)
 pur_disp_elf2flt   = echo "  "ELF2FLT $(ELF2FLTFLAGS) $(show_objs)
 sil_disp_compile.c = true
 sil_disp_compile.h = true
 sil_disp_strip     = true
 sil_disp_link      = true
+sil_disp_link.h    = true
 sil_disp_ar        = true
 sil_disp_elf2flt   = true
 ver_disp_compile.c = echo $(cmd_compile.c)
 ver_disp_compile.h = echo $(cmd_compile.h)
 ver_disp_strip     = echo $(cmd_strip)
 ver_disp_link      = echo $(cmd_link)
+ver_disp_link.h    = echo $(cmd_link.h)
 ver_disp_ar        = echo $(cmd_ar)
 ver_disp_elf2flt   = echo $(cmd_elf2flt)
 disp_compile.c     = $($(DISP)_disp_compile.c)
 disp_compile.h     = $($(DISP)_disp_compile.h)
 disp_strip         = $($(DISP)_disp_strip)
 disp_link          = $($(DISP)_disp_link)
+disp_link.h        = $($(DISP)_disp_link.h)
 disp_ar            = $($(DISP)_disp_ar)
 disp_gen           = $(SECHO) "  "GEN $@ ; true
 disp_doc           = $(SECHO) "  "DOC $(subst docs/,,$@) ; true
@@ -325,12 +329,14 @@
 cmd_compile.h      = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
 cmd_strip          = $(STRIPCMD) $@
 cmd_link           = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS)
+cmd_link.h         = $(HOSTCC) $(HOSTCFLAGS) $< -o $@
 cmd_ar             = $(AR) $(ARFLAGS) $@ $^
 cmd_elf2flt        = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@
 compile.c          = @$(disp_compile.c) ; $(cmd_compile.c)
 compile.h          = @$(disp_compile.h) ; $(cmd_compile.h)
 do_strip           = @$(disp_strip)     ; $(cmd_strip)
 do_link            = @$(disp_link)      ; $(cmd_link)
+do_link.h          = @$(disp_link.h)    ; $(cmd_link.h)
 do_ar              = @$(disp_ar)        ; $(cmd_ar)
 do_elf2flt         = @$(disp_elf2flt)   ; $(cmd_elf2flt)