svn commit: branches/busybox_scratch
aldot at busybox.net
aldot at busybox.net
Mon Jul 3 12:59:02 UTC 2006
Author: aldot
Date: 2006-07-03 05:59:00 -0700 (Mon, 03 Jul 2006)
New Revision: 15586
Log:
- add dir_flags; e.g. e2fsprogs_CFLAGS=-fblah is passed to all files there.
- remove indirection from pretty-printing make-output; show actual compile commands.
Modified:
branches/busybox_scratch/Rules.mak
Changeset:
Modified: branches/busybox_scratch/Rules.mak
===================================================================
--- branches/busybox_scratch/Rules.mak 2006-07-03 05:22:36 UTC (rev 15585)
+++ branches/busybox_scratch/Rules.mak 2006-07-03 12:59:00 UTC (rev 15586)
@@ -360,37 +360,38 @@
endif
show_objs = $(subst $(top_builddir)/,,$(subst ../,,$@))
-pur_disp_compile.c = echo " "CC $(show_objs)
-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)
+dir_flags = $(subst $(top_builddir)/,,$(subst ../,,$(srcdir)))
+pur_disp_compile.c = echo " "CC $(show_objs) ;
+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 =
+sil_disp_compile.h =
+sil_disp_strip =
+sil_disp_link =
+sil_disp_link.h =
+sil_disp_ar =
+sil_disp_elf2flt =
+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 = $(Q)$($(DISP)_disp_compile.c)
+disp_compile.h = $(Q)$($(DISP)_disp_compile.h)
+disp_strip = $(Q)$($(DISP)_disp_strip)
+disp_link = $(Q)$($(DISP)_disp_link)
+disp_link.h = $(Q)$($(DISP)_disp_link.h)
+disp_ar = $(Q)$($(DISP)_disp_ar)
disp_gen = $(SECHO) " "GEN $@ ; true
disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true
disp_elf2flt = $($(DISP)_disp_elf2flt)
-cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $($(dir_flags)_CFLAGS) -c -o $@ $<
cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) -c -o $@ $<
cmd_strip = $(STRIPCMD) $@
cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
@@ -408,14 +409,14 @@
cmd_link.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) $< -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.so = @$(disp_link) ; $(cmd_link.so)
-do_link.h = @$(disp_link.h) ; $(cmd_link.h)
-do_ar = @$(disp_ar) ; $(cmd_ar)
-do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt)
+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.so = $(disp_link) $(cmd_link.so)
+do_link.h = $(disp_link.h) $(cmd_link.h)
+do_ar = $(disp_ar) $(cmd_ar)
+do_elf2flt = $(disp_elf2flt) $(cmd_elf2flt)
uppercase = $(shell echo $1 | $(SED) -e "y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/")
%.a:
More information about the busybox-cvs
mailing list