diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index e602d2cd37a..50cc0ace56a 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -701,17 +701,30 @@ makefiles in the build (once it is installed). This make fragment should define:

- When this makefile fragment runs, it will be passed TOPDIR which + When this makefile fragment runs, it will be passed TOPDIR which is the path to the root directory of the build. This makefile - fragment may include ${TOPDIR}/.config to perform configuration - specific settings. For example, the CFLAGS will most likely be - different if CONFIG_DEBUG=y. + fragment should include:

+ +

+ Definitions in the Make.defs file probably depend on some of the + settings in the .config file. For example, the CFLAGS will most likely be + different if CONFIG_DEBUG=y. +

+

+ The included tools/Config.mk file contains additional definitions that may + be overriden in the architecture-specific Make.defs file as necessary: +

+

  • diff --git a/arch/8051/src/Makefile b/arch/8051/src/Makefile index f228b46972f..0f1b1b85773 100644 --- a/arch/8051/src/Makefile +++ b/arch/8051/src/Makefile @@ -148,7 +148,7 @@ up_mem.h: pass1.mem # Combine all objects in this directory into a library libarch$(LIBEXT): up_mem.h $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) # This is a kludge to work around some conflicting symbols in libsdcc.liXqueb diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index 243b5761ea1..ba506d4da18 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -132,7 +132,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile index 067a99c3729..462968ed53c 100644 --- a/arch/avr/src/Makefile +++ b/arch/avr/src/Makefile @@ -130,7 +130,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile index 13788b71df3..0ada6c4c2c2 100644 --- a/arch/hc/src/Makefile +++ b/arch/hc/src/Makefile @@ -125,7 +125,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile index c4a73e39232..057b95d220e 100644 --- a/arch/mips/src/Makefile +++ b/arch/mips/src/Makefile @@ -123,7 +123,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/rgmp/src/Makefile b/arch/rgmp/src/Makefile index 4df7a9ce614..7650a0a942a 100644 --- a/arch/rgmp/src/Makefile +++ b/arch/rgmp/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c # The architecture-specific library libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) # Generate the final NuttX binary by linking the host-specific objects with the NuttX # specific objects (with munged names) diff --git a/arch/sh/src/Makefile b/arch/sh/src/Makefile index c096bb0da4b..132ca4610ed 100644 --- a/arch/sh/src/Makefile +++ b/arch/sh/src/Makefile @@ -121,7 +121,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index d46defe135f..a5d6100a3f3 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -155,7 +155,7 @@ $(HOSTOBJS): %$(OBJEXT): %.c # The architecture-specific library libarch$(LIBEXT): $(NUTTXOBJS) - $(call ARCHIVE, $@, "$(NUTTXOBJS)") + $(call ARCHIVE, $@, $(NUTTXOBJS)) # The "board"-specific library. Of course, there really are no boards in # the simulation. However, this is a good place to keep parts of the simulation diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile index 7ee92e8384e..19193709cc9 100644 --- a/arch/x86/src/Makefile +++ b/arch/x86/src/Makefile @@ -131,7 +131,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 3e2f487ffa4..a2a441f7421 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -88,7 +88,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc index 5527bcb55c7..7c9f45a6c7c 100644 --- a/arch/z80/src/Makefile.sdcc +++ b/arch/z80/src/Makefile.sdcc @@ -134,7 +134,7 @@ endif # Combine all objects in this directory into a library libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) # This builds the libboard library in the board/ subdirectory diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii index 93d80d2ddb0..666af89452c 100644 --- a/arch/z80/src/Makefile.zdsii +++ b/arch/z80/src/Makefile.zdsii @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) board/libboard$(LIBEXT): $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) diff --git a/binfmt/Makefile b/binfmt/Makefile index 378a737f601..06def551f18 100644 --- a/binfmt/Makefile +++ b/binfmt/Makefile @@ -78,7 +78,7 @@ $(BINFMT_COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(BINFMT_OBJS) - $(call ARCHIVE, $@, "$(BINFMT_OBJS)") + $(call ARCHIVE, $@, $(BINFMT_OBJS)) .depend: Makefile $(BINFMT_SRCS) $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep diff --git a/configs/README.txt b/configs/README.txt index 81749f29fc5..575eb690ab9 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -103,14 +103,23 @@ Make.defs -- This makefile fragment provides architecture and Tools: CC, LD, AR, NM, OBJCOPY, OBJDUMP Tool options: CFLAGS, LDFLAGS - COMPILE, ASSEMBLE, ARCHIVE, CLEAN, and MKDEP macros When this makefile fragment runs, it will be passed TOPDIR which is the path to the root directory of the build. This makefile - fragment may include ${TOPDIR}/.config to perform configuration - specific settings. For example, the CFLAGS will most likely be + fragment should include: + + $(TOPDIR)/.config : Nuttx configuration + $(TOPDIR)/tools/Config.mk : Common definitions + + Definitions in the Make.defs file probably depend on some of the + settings in the .config file. For example, the CFLAGS will most likely be different if CONFIG_DEBUG=y. + The included tools/Config.mk file contains additional definitions that may + be overriden in the architecture-specific Make.defs file as necessary: + + COMPILE, ASSEMBLE, ARCHIVE, CLEAN, and MKDEP macros + defconfig -- This is a configuration file similar to the Linux configuration file. In contains variable/value pairs like: diff --git a/configs/amber/src/Makefile b/configs/amber/src/Makefile index 358e4dec339..befcee2134e 100644 --- a/configs/amber/src/Makefile +++ b/configs/amber/src/Makefile @@ -77,7 +77,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/avr32dev1/src/Makefile b/configs/avr32dev1/src/Makefile index b997d7a4446..1abc7c7b928 100644 --- a/configs/avr32dev1/src/Makefile +++ b/configs/avr32dev1/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/c5471evm/src/Makefile b/configs/c5471evm/src/Makefile index 284bfb91d72..42c87ccab98 100644 --- a/configs/c5471evm/src/Makefile +++ b/configs/c5471evm/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/compal_e88/src/Makefile b/configs/compal_e88/src/Makefile index e60d599d9e5..8394fd47d27 100644 --- a/configs/compal_e88/src/Makefile +++ b/configs/compal_e88/src/Makefile @@ -60,7 +60,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/compal_e99/src/Makefile b/configs/compal_e99/src/Makefile index adaf8b801de..915786222db 100644 --- a/configs/compal_e99/src/Makefile +++ b/configs/compal_e99/src/Makefile @@ -60,7 +60,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile index e9fcd7f41f7..fc33ef32c9f 100644 --- a/configs/demo9s12ne64/src/Makefile +++ b/configs/demo9s12ne64/src/Makefile @@ -66,7 +66,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile index 57011f08a7c..8b628a0ebc4 100644 --- a/configs/ea3131/src/Makefile +++ b/configs/ea3131/src/Makefile @@ -85,7 +85,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile index 088ce63d8f5..c360856475c 100644 --- a/configs/ea3152/src/Makefile +++ b/configs/ea3152/src/Makefile @@ -85,7 +85,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile index c2b1437eeeb..3bb71aa89e5 100644 --- a/configs/eagle100/src/Makefile +++ b/configs/eagle100/src/Makefile @@ -66,7 +66,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ekk-lm3s9b96/src/Makefile b/configs/ekk-lm3s9b96/src/Makefile index a5e4f197f4e..a012fcc2557 100644 --- a/configs/ekk-lm3s9b96/src/Makefile +++ b/configs/ekk-lm3s9b96/src/Makefile @@ -68,7 +68,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs index 0914bc17aab..4eaf34fe01b 100644 --- a/configs/ez80f910200kitg/ostest/Make.defs +++ b/configs/ez80f910200kitg/ostest/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200kitg/src/Makefile b/configs/ez80f910200kitg/src/Makefile index 8a9d94e47a4..a5515d855bf 100644 --- a/configs/ez80f910200kitg/src/Makefile +++ b/configs/ez80f910200kitg/src/Makefile @@ -64,7 +64,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ez80f910200zco/dhcpd/Make.defs b/configs/ez80f910200zco/dhcpd/Make.defs index 59f32fb4577..326ea137b29 100644 --- a/configs/ez80f910200zco/dhcpd/Make.defs +++ b/configs/ez80f910200zco/dhcpd/Make.defs @@ -166,16 +166,17 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif +endif define CLEAN $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/configs/ez80f910200zco/httpd/Make.defs b/configs/ez80f910200zco/httpd/Make.defs index 615939026cb..6a30c70004d 100644 --- a/configs/ez80f910200zco/httpd/Make.defs +++ b/configs/ez80f910200zco/httpd/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200zco/nettest/Make.defs b/configs/ez80f910200zco/nettest/Make.defs index ea309af75aa..ce323666431 100644 --- a/configs/ez80f910200zco/nettest/Make.defs +++ b/configs/ez80f910200zco/nettest/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200zco/nsh/Make.defs b/configs/ez80f910200zco/nsh/Make.defs index 91c900b33f0..9dbaceb6450 100644 --- a/configs/ez80f910200zco/nsh/Make.defs +++ b/configs/ez80f910200zco/nsh/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs index 5cc8356129a..6a49cbc5738 100644 --- a/configs/ez80f910200zco/ostest/Make.defs +++ b/configs/ez80f910200zco/ostest/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200zco/poll/Make.defs b/configs/ez80f910200zco/poll/Make.defs index 2cd6fa5d387..fd32a6df63e 100644 --- a/configs/ez80f910200zco/poll/Make.defs +++ b/configs/ez80f910200zco/poll/Make.defs @@ -166,11 +166,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/ez80f910200zco/src/Makefile b/configs/ez80f910200zco/src/Makefile index 85489fe91ac..faaec39ef71 100644 --- a/configs/ez80f910200zco/src/Makefile +++ b/configs/ez80f910200zco/src/Makefile @@ -71,7 +71,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/fire-stm32v2/src/Makefile b/configs/fire-stm32v2/src/Makefile index 2045de79342..2fa9039ce0b 100644 --- a/configs/fire-stm32v2/src/Makefile +++ b/configs/fire-stm32v2/src/Makefile @@ -107,7 +107,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/hymini-stm32v/src/Makefile b/configs/hymini-stm32v/src/Makefile index 54d0f9339e0..42b16287caa 100644 --- a/configs/hymini-stm32v/src/Makefile +++ b/configs/hymini-stm32v/src/Makefile @@ -86,7 +86,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile index d8373e1ab18..dda93719d02 100644 --- a/configs/kwikstik-k40/src/Makefile +++ b/configs/kwikstik-k40/src/Makefile @@ -85,7 +85,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lincoln60/src/Makefile b/configs/lincoln60/src/Makefile index 3820e5cd50f..b31f42ba41b 100644 --- a/configs/lincoln60/src/Makefile +++ b/configs/lincoln60/src/Makefile @@ -76,7 +76,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lm3s6432-s2e/src/Makefile b/configs/lm3s6432-s2e/src/Makefile index c1290f6c24a..64faf3a7781 100644 --- a/configs/lm3s6432-s2e/src/Makefile +++ b/configs/lm3s6432-s2e/src/Makefile @@ -67,7 +67,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile index 2e560c00442..12750d192ab 100644 --- a/configs/lm3s6965-ek/src/Makefile +++ b/configs/lm3s6965-ek/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile index eaf5eeae19b..8b1400ea0d0 100644 --- a/configs/lm3s8962-ek/src/Makefile +++ b/configs/lm3s8962-ek/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile index d4f4d6686ad..9698f78fc60 100644 --- a/configs/lpc4330-xplorer/src/Makefile +++ b/configs/lpc4330-xplorer/src/Makefile @@ -104,7 +104,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/lpcxpresso-lpc1768/src/Makefile b/configs/lpcxpresso-lpc1768/src/Makefile index 51aa1a7ca71..d1012b8a904 100644 --- a/configs/lpcxpresso-lpc1768/src/Makefile +++ b/configs/lpcxpresso-lpc1768/src/Makefile @@ -76,7 +76,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/m68332evb/src/Makefile b/configs/m68332evb/src/Makefile index 0644837339f..46a06c71ab5 100644 --- a/configs/m68332evb/src/Makefile +++ b/configs/m68332evb/src/Makefile @@ -54,7 +54,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile index 9d2d489fec4..31b5df171dd 100644 --- a/configs/mbed/src/Makefile +++ b/configs/mbed/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile index 26c2c14483b..62ff003a160 100644 --- a/configs/mcu123-lpc214x/src/Makefile +++ b/configs/mcu123-lpc214x/src/Makefile @@ -77,7 +77,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/micropendous3/src/Makefile b/configs/micropendous3/src/Makefile index c926415f5e5..3041fb282d8 100644 --- a/configs/micropendous3/src/Makefile +++ b/configs/micropendous3/src/Makefile @@ -77,7 +77,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/mirtoo/src/Makefile b/configs/mirtoo/src/Makefile index 29b91f46999..9bda8246df2 100644 --- a/configs/mirtoo/src/Makefile +++ b/configs/mirtoo/src/Makefile @@ -76,7 +76,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/mx1ads/src/Makefile b/configs/mx1ads/src/Makefile index 9e4d8c99a8a..e55195649a4 100644 --- a/configs/mx1ads/src/Makefile +++ b/configs/mx1ads/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile index bfd838bdf7d..52cd7897b14 100644 --- a/configs/ne64badge/src/Makefile +++ b/configs/ne64badge/src/Makefile @@ -66,7 +66,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile index d57d94ce85a..114e5bf9973 100644 --- a/configs/ntosd-dm320/src/Makefile +++ b/configs/ntosd-dm320/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile index bc21b12499d..1f2c02fd1e7 100644 --- a/configs/nucleus2g/src/Makefile +++ b/configs/nucleus2g/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/olimex-lpc1766stk/src/Makefile b/configs/olimex-lpc1766stk/src/Makefile index 326fe52e418..955c80937ee 100644 --- a/configs/olimex-lpc1766stk/src/Makefile +++ b/configs/olimex-lpc1766stk/src/Makefile @@ -84,7 +84,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile index 46ad0e45e5e..12cddf95be2 100644 --- a/configs/olimex-lpc2378/src/Makefile +++ b/configs/olimex-lpc2378/src/Makefile @@ -73,7 +73,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/olimex-stm32-p107/src/Makefile b/configs/olimex-stm32-p107/src/Makefile index 7bf68b76134..a0d6fc5ff10 100644 --- a/configs/olimex-stm32-p107/src/Makefile +++ b/configs/olimex-stm32-p107/src/Makefile @@ -69,7 +69,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile index ef6105a5f73..766305c03ba 100644 --- a/configs/olimex-strp711/src/Makefile +++ b/configs/olimex-strp711/src/Makefile @@ -70,7 +70,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/pcblogic-pic32mx/src/Makefile b/configs/pcblogic-pic32mx/src/Makefile index d97e4cc26a7..6eda3248bbb 100644 --- a/configs/pcblogic-pic32mx/src/Makefile +++ b/configs/pcblogic-pic32mx/src/Makefile @@ -68,7 +68,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/pic32-starterkit/src/Makefile b/configs/pic32-starterkit/src/Makefile index 5e02f533159..a1ee69b929f 100644 --- a/configs/pic32-starterkit/src/Makefile +++ b/configs/pic32-starterkit/src/Makefile @@ -79,7 +79,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/pic32mx7mmb/src/Makefile b/configs/pic32mx7mmb/src/Makefile index 3c31060fdf6..92445604ed4 100644 --- a/configs/pic32mx7mmb/src/Makefile +++ b/configs/pic32mx7mmb/src/Makefile @@ -83,7 +83,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/pjrc-8051/src/Makefile b/configs/pjrc-8051/src/Makefile index db95dc450f3..5d9b553692e 100644 --- a/configs/pjrc-8051/src/Makefile +++ b/configs/pjrc-8051/src/Makefile @@ -56,7 +56,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/qemu-i486/src/Makefile b/configs/qemu-i486/src/Makefile index 1df02f58e3f..785b78be7a4 100644 --- a/configs/qemu-i486/src/Makefile +++ b/configs/qemu-i486/src/Makefile @@ -63,7 +63,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile index 7d4433e81d0..97227b40a4a 100644 --- a/configs/sam3u-ek/src/Makefile +++ b/configs/sam3u-ek/src/Makefile @@ -76,7 +76,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/shenzhou/src/Makefile b/configs/shenzhou/src/Makefile index 1c1d000f9fa..ad4c1d7718b 100644 --- a/configs/shenzhou/src/Makefile +++ b/configs/shenzhou/src/Makefile @@ -127,7 +127,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile index b5c101d29f7..9b924486d0f 100644 --- a/configs/sim/src/Makefile +++ b/configs/sim/src/Makefile @@ -62,7 +62,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c libboard$(LIBEXT): $(OBJS) @$(AR) $@ # Create an empty archive ifneq ($(OBJS),) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) endif .depend: Makefile $(SRCS) diff --git a/configs/skp16c26/src/Makefile b/configs/skp16c26/src/Makefile index 64a976ce8f8..21a528c04c9 100644 --- a/configs/skp16c26/src/Makefile +++ b/configs/skp16c26/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile index 70bf589be1d..e9af34f2139 100644 --- a/configs/stm3210e-eval/src/Makefile +++ b/configs/stm3210e-eval/src/Makefile @@ -111,7 +111,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/stm3220g-eval/src/Makefile b/configs/stm3220g-eval/src/Makefile index 7fb39104419..1a670588f8f 100644 --- a/configs/stm3220g-eval/src/Makefile +++ b/configs/stm3220g-eval/src/Makefile @@ -111,7 +111,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/stm3240g-eval/src/Makefile b/configs/stm3240g-eval/src/Makefile index 40c3b8769be..8ea4690c558 100644 --- a/configs/stm3240g-eval/src/Makefile +++ b/configs/stm3240g-eval/src/Makefile @@ -119,7 +119,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/stm32f100rc_generic/src/Makefile b/configs/stm32f100rc_generic/src/Makefile index 16d72dd0d81..c0916f40cb3 100644 --- a/configs/stm32f100rc_generic/src/Makefile +++ b/configs/stm32f100rc_generic/src/Makefile @@ -63,7 +63,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile index 2f9a4baefb6..b6d0f6226d6 100644 --- a/configs/stm32f4discovery/src/Makefile +++ b/configs/stm32f4discovery/src/Makefile @@ -123,7 +123,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/sure-pic32mx/src/Makefile b/configs/sure-pic32mx/src/Makefile index 28ae67c63b2..3c8e5277bd9 100644 --- a/configs/sure-pic32mx/src/Makefile +++ b/configs/sure-pic32mx/src/Makefile @@ -88,7 +88,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/teensy/src/Makefile b/configs/teensy/src/Makefile index 11faf9491b6..a1e6a6e05cd 100644 --- a/configs/teensy/src/Makefile +++ b/configs/teensy/src/Makefile @@ -83,7 +83,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile index 4737686587e..3c036b08865 100644 --- a/configs/twr-k60n512/src/Makefile +++ b/configs/twr-k60n512/src/Makefile @@ -85,7 +85,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/ubw32/src/Makefile b/configs/ubw32/src/Makefile index a89ede256db..49243ab83a6 100644 --- a/configs/ubw32/src/Makefile +++ b/configs/ubw32/src/Makefile @@ -79,7 +79,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/us7032evb1/src/Makefile b/configs/us7032evb1/src/Makefile index 7bb51b9b28b..cd4fc1b746e 100644 --- a/configs/us7032evb1/src/Makefile +++ b/configs/us7032evb1/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/vsn/src/Makefile b/configs/vsn/src/Makefile index 657f016b254..917dcbd7a9b 100644 --- a/configs/vsn/src/Makefile +++ b/configs/vsn/src/Makefile @@ -81,7 +81,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) # Register application diff --git a/configs/xtrs/src/Makefile b/configs/xtrs/src/Makefile index 7715fbb0afe..0662e145e31 100644 --- a/configs/xtrs/src/Makefile +++ b/configs/xtrs/src/Makefile @@ -57,7 +57,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 79fa655bb5d..8589b5566a2 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -158,11 +158,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs index d7b93d659d9..3620ffcbe75 100644 --- a/configs/z16f2800100zcog/pashello/Make.defs +++ b/configs/z16f2800100zcog/pashello/Make.defs @@ -158,11 +158,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 43695f74825..8c5bfd1e85e 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -64,7 +64,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/z80sim/src/Makefile b/configs/z80sim/src/Makefile index 65d9db9a487..2dc3a785ca4 100644 --- a/configs/z80sim/src/Makefile +++ b/configs/z80sim/src/Makefile @@ -56,7 +56,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs index fba10186458..9e89220f8cc 100644 --- a/configs/z8encore000zco/ostest/Make.defs +++ b/configs/z8encore000zco/ostest/Make.defs @@ -191,11 +191,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/z8encore000zco/src/Makefile b/configs/z8encore000zco/src/Makefile index a40b6f42c1a..e274e7b83f8 100644 --- a/configs/z8encore000zco/src/Makefile +++ b/configs/z8encore000zco/src/Makefile @@ -64,7 +64,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/ostest/Make.defs index 4fa6af2ec29..899f3955c7a 100644 --- a/configs/z8f64200100kit/ostest/Make.defs +++ b/configs/z8f64200100kit/ostest/Make.defs @@ -191,11 +191,11 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(subst ",,$(2)) ; do \ + $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done diff --git a/configs/z8f64200100kit/src/Makefile b/configs/z8f64200100kit/src/Makefile index a8b618b6f53..da104cedf2d 100644 --- a/configs/z8f64200100kit/src/Makefile +++ b/configs/z8f64200100kit/src/Makefile @@ -64,7 +64,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/drivers/Makefile b/drivers/Makefile index 3a6e3402237..98bb8a7d0f3 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -102,7 +102,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/fs/Makefile b/fs/Makefile index b79b1734d86..b55ec6218b5 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -120,7 +120,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) $(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \ diff --git a/graphics/Makefile b/graphics/Makefile index 09d7cfa266f..d0fdb647dd3 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -186,7 +186,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) mklibgraphics: gensources $(BIN) diff --git a/libc/Makefile b/libc/Makefile index ac8fe4bc7a7..313629f2b81 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -79,7 +79,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) ifneq ($(BIN),$(UBIN)) .userlib: @@ -108,7 +108,11 @@ depend: .depend uclean: ifneq ($(OBJEXT),) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + $(Q) if exist .userlib ]; then del *$(OBJEXT) +else $(Q) ( if [ -f .userlib ]; then rm -f *$(OBJEXT); fi ) +endif endif $(Q) rm -f .userlib *~ .*.swp @@ -116,7 +120,11 @@ endif kclean: ifneq ($(OBJEXT),) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + $(Q) if exist .kernlib ]; then del *$(OBJEXT) +else $(Q) ( if [ -f .kernlib ]; then rm -f *$(OBJEXT); fi ) +endif endif $(Q) rm -f .kernlib *~ .*.swp diff --git a/libxx/Makefile b/libxx/Makefile index e5fff1c479c..6093ad49028 100644 --- a/libxx/Makefile +++ b/libxx/Makefile @@ -96,7 +96,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx $(call COMPILEXX, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep diff --git a/mm/Makefile b/mm/Makefile index fef9cc9ddc8..8cdfb4d279b 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -61,7 +61,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/net/Makefile b/net/Makefile index 5ce4de4ccb8..aed5734dfc4 100644 --- a/net/Makefile +++ b/net/Makefile @@ -100,7 +100,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) diff --git a/sched/Makefile b/sched/Makefile index 571393cb205..601ba581930 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -196,7 +196,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @@ -205,7 +205,7 @@ $(BIN): $(OBJS) depend: .depend clean: - $(Q) rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) $(call CLEAN) distclean: clean diff --git a/syscall/Makefile b/syscall/Makefile index 0de895cde78..a21eb04ee76 100644 --- a/syscall/Makefile +++ b/syscall/Makefile @@ -72,7 +72,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN1): $(PROXY_OBJS) - $(call ARCHIVE, $@, "$(PROXY_OBJS)") + $(call ARCHIVE, $@, $(PROXY_OBJS)) $(BIN2): $(STUB_OBJS) $(call ARCHIVE, $@, "$(STUB_OBJS)") diff --git a/tools/Config.mk b/tools/Config.mk index 3a0714c10a9..b7f8d9bbe0c 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -145,15 +145,19 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE @echo "AR: $2" $(AR) $1 - $(Q) $(AR) $1 $(subst ",,$(2)) + $(Q) $(AR) $1 $(2) endef else define ARCHIVE @echo "AR: $2" - $(Q) $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 FAILED!" ; exit 1 ; } + $(Q) $(AR) $1 $(2) || { echo "$(AR) $1 FAILED!" ; exit 1 ; } endef endif define CLEAN +ifeq ($(CONFIG_WINDOWS_NATIVE),y) $(Q) rm -f *.o *.a +else + $(Q) rm -f *.o *.a *~ .*.swp +endif endef