andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved common makefile rules. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10495 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-08-28 09:01:23 +00:00
parent e606d7a1ce
commit c69becde25
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/common/startup/ARM/compilers/GCC/rules.mk
View File

@ -199,7 +199,7 @@ $(OBJDIR):
$(LSTDIR): $(LSTDIR):
@mkdir -p $(LSTDIR) @mkdir -p $(LSTDIR)
$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
@ -208,7 +208,7 @@ else
@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
@ -217,7 +217,7 @@ else
@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile $(ACOBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
@ -226,7 +226,7 @@ else
@$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile $(TCOBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
@ -235,7 +235,7 @@ else
@$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
@ -244,7 +244,7 @@ else
@$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile $(ASMXOBJS) : $(OBJDIR)/%.o : %.S $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@

12
os/common/startup/ARMCMx/compilers/GCC/rules.mk
View File

@ -196,7 +196,7 @@ $(OBJDIR):
$(LSTDIR): $(LSTDIR):
@mkdir -p $(LSTDIR) @mkdir -p $(LSTDIR)
$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
@ -205,7 +205,7 @@ else
@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
@ -214,7 +214,7 @@ else
@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile $(ACOBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
@ -223,7 +223,7 @@ else
@$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile $(TCOBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
@ -232,7 +232,7 @@ else
@$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
@ -241,7 +241,7 @@ else
@$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile $(ASMXOBJS) : $(OBJDIR)/%.o : %.S $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ $(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@

8
os/common/startup/SIMIA32/compilers/GCC/rules.mk
View File

@ -115,7 +115,7 @@ $(OBJDIR):
$(LSTDIR): $(LSTDIR):
@mkdir -p $(LSTDIR) @mkdir -p $(LSTDIR)
$(CPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(CPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@
@ -124,7 +124,7 @@ else
@$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(COBJS) : $(OBJDIR)/%.o : %.c Makefile $(COBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@
@ -133,7 +133,7 @@ else
@$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
@ -142,7 +142,7 @@ else
@$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile $(ASMXOBJS) : $(OBJDIR)/%.o : %.S $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@ $(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@

8
os/common/startup/e200/compilers/GCC/rules.mk
View File

@ -141,7 +141,7 @@ $(OBJDIR):
$(LSTDIR): $(LSTDIR):
@mkdir -p $(LSTDIR) @mkdir -p $(LSTDIR)
$(CPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(CPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@
@ -150,7 +150,7 @@ else
@$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(COBJS) : $(OBJDIR)/%.o : %.c Makefile $(COBJS) : $(OBJDIR)/%.o : %.c $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@
@ -159,7 +159,7 @@ else
@$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
@ -168,7 +168,7 @@ else
@$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMXOBJS) : $(OBJDIR)/%.o : %.S Makefile $(ASMXOBJS) : $(OBJDIR)/%.o : %.S $(MAKEFILE_LIST)
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@ $(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@

6
readme.txt
View File

@ -89,6 +89,12 @@
***************************************************************************** *****************************************************************************
*** Next *** *** Next ***
- NEW: Added an USB_CDC multi-target demo application showcasing how to
manage a project with multiple target boards/devices and handle
portability issues.
- NEW: Improved the various rules.mk to handle "touching" of all
included makefiles, now the makefile is no more assumed to
be called "Makefile".
- NEW: Added to the Makefiles the ability to change the default build, - NEW: Added to the Makefiles the ability to change the default build,
dependencies and configuration directories. This makes possible dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project. to have multiple non-conflicting makefiles in the same project.