diff --git a/make/build.mk b/make/build.mk index 6d05c3e1..f9e46122 100644 --- a/make/build.mk +++ b/make/build.mk @@ -11,52 +11,52 @@ endif $(EXTRA_LINKER_SCRIPTS): $(OUTBIN): $(OUTELF) - @echo generating image: $@ + $(info agenerating image: $@) $(NOECHO)$(SIZE) $< $(NOECHO)$(OBJCOPY) -O binary $< $@ $(OUTELF).hex: $(OUTELF) - @echo generating hex file: $@ + $(info generating hex file: $@) $(NOECHO)$(OBJCOPY) -O ihex $< $@ $(OUTELF): $(ALLMODULE_OBJS) $(EXTRA_OBJS) $(LINKER_SCRIPT) $(EXTRA_LINKER_SCRIPTS) - @echo linking $@ + $(info linking $@) $(NOECHO)$(SIZE) -t --common $(sort $(ALLMODULE_OBJS)) $(EXTRA_OBJS) $(NOECHO)$(LD) $(GLOBAL_LDFLAGS) $(ARCH_LDFLAGS) -dT $(LINKER_SCRIPT) \ $(addprefix -T,$(EXTRA_LINKER_SCRIPTS)) \ $(ALLMODULE_OBJS) $(EXTRA_OBJS) $(LIBGCC) -Map=$(OUTELF).map -o $@ $(OUTELF).sym: $(OUTELF) - @echo generating symbols: $@ + $(info generating symbols: $@) $(NOECHO)$(OBJDUMP) -t $< | $(CPPFILT) > $@ $(OUTELF).sym.sorted: $(OUTELF) - @echo generating sorted symbols: $@ + $(info generating sorted symbols: $@) $(NOECHO)$(OBJDUMP) -t $< | $(CPPFILT) | sort > $@ $(OUTELF).lst: $(OUTELF) - @echo generating listing: $@ + $(info generating listing: $@) $(NOECHO)$(OBJDUMP) -Mreg-names-raw -d $< | $(CPPFILT) > $@ $(OUTELF).debug.lst: $(OUTELF) - @echo generating listing: $@ + $(info generating listing: $@) $(NOECHO)$(OBJDUMP) -Mreg-names-raw -S $< | $(CPPFILT) > $@ $(OUTELF).dump: $(OUTELF) - @echo generating objdump: $@ + $(info generating objdump: $@) $(NOECHO)$(OBJDUMP) -x $< > $@ $(OUTELF).size: $(OUTELF) - @echo generating size map: $@ + $(info generating size map: $@) $(NOECHO)$(NM) -S --size-sort $< > $@ # print some information about the build $(BUILDDIR)/srcfiles.txt: $(OUTELF) - @echo generating $@ + $(info generating $@) $(NOECHO)echo $(sort $(ALLSRCS)) | tr ' ' '\n' > $@ $(BUILDDIR)/include_paths.txt: $(OUTELF) - @echo generating $@ + $(info generating $@) $(NOECHO)echo $(subst -I,,$(sort $(GLOBAL_INCLUDES))) | tr ' ' '\n' > $@ #include arch/$(ARCH)/compile.mk diff --git a/make/compile.mk b/make/compile.mk index bae61d57..9b7d6e5e 100644 --- a/make/compile.mk +++ b/make/compile.mk @@ -43,43 +43,43 @@ $(MODULE_OBJS): MODULE_INCLUDES:=$(MODULE_INCLUDES) $(MODULE_COBJS): $(BUILDDIR)/%.o: %.c $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(ARCH_CFLAGS) $(MODULE_CFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_CPPOBJS): $(BUILDDIR)/%.o: %.cpp $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_CCOBJS): $(BUILDDIR)/%.o: %.cc $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_ASMOBJS): $(BUILDDIR)/%.o: %.S $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(ARCH_ASMFLAGS) $(MODULE_ASMFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ # overridden arm versions $(MODULE_ARM_COBJS): $(BUILDDIR)/%.o: %.c $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(ARCH_CFLAGS) $(MODULE_CFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_ARM_CPPOBJS): $(BUILDDIR)/%.o: %.cpp $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_ARM_CCOBJS): $(BUILDDIR)/%.o: %.cc $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(ARCH_CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ $(MODULE_ARM_ASMOBJS): $(BUILDDIR)/%.o: %.S $(MODULE_SRCDEPS) @$(MKDIR) - @echo compiling $< + $(info compiling $<) $(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(ARCH_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(ARCH_ASMFLAGS) $(MODULE_ASMFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MP -MT $@ -MF $(@:%o=%d) -o $@ # clear some variables we set here diff --git a/make/macros.mk b/make/macros.mk index a45aca14..6c6d5fc3 100644 --- a/make/macros.mk +++ b/make/macros.mk @@ -32,8 +32,8 @@ endef # generate a header file at $1 with an expanded variable in $2 define MAKECONFIGHEADER + $(info generating $1) \ $(MKDIR); \ - echo generating $1; \ rm -f $1.tmp; \ LDEF=`echo $1 | tr '/\\.-' '_' | sed "s/C++/CPP/g;s/c++/cpp/g"`; \ echo \#ifndef __$${LDEF}_H > $1.tmp; \ diff --git a/make/module.mk b/make/module.mk index a2367fe1..dcd97936 100644 --- a/make/module.mk +++ b/make/module.mk @@ -87,7 +87,7 @@ include make/compile.mk MODULE_OBJECT := $(call TOBUILDDIR,$(MODULE_SRCDIR).mod.o) $(MODULE_OBJECT): $(MODULE_OBJS) $(MODULE_EXTRA_OBJS) @$(MKDIR) - @echo linking $@ + $(info linking $@) $(NOECHO)$(LD) $(GLOBAL_MODULE_LDFLAGS) -r $^ -o $@ # track all of the source files compiled