diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 18:36:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 18:36:28 +0000 |
| commit | a42dcee79d5090c8df3a3a04cd1cf2b6d0347575 (patch) | |
| tree | b69e31da1b3edac0b4815d212b99ac312fb194e2 /nuttx/tools | |
| parent | 2e97e079981e4f8070ede6528f82c173b893fb62 (diff) | |
| download | px4-firmware-a42dcee79d5090c8df3a3a04cd1cf2b6d0347575.tar.gz px4-firmware-a42dcee79d5090c8df3a3a04cd1cf2b6d0347575.tar.bz2 px4-firmware-a42dcee79d5090c8df3a3a04cd1cf2b6d0347575.zip | |
Completes removal bash ARCHIVE loop; Adds basic Makefile for native windows build
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5338 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/tools')
| -rw-r--r-- | nuttx/tools/Config.mk | 12 | ||||
| -rw-r--r-- | nuttx/tools/Makefile.export | 4 | ||||
| -rw-r--r-- | nuttx/tools/Makefile.host | 18 |
3 files changed, 21 insertions, 13 deletions
diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index 3a82a1937..47131b800 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -62,10 +62,18 @@ define ASSEMBLE $(Q) $(CC) -c $(AFLAGS) $1 -o $2 endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } + echo "AR: $2" + $(AR) $1 + $(AR) $1 $(subst ",,$(2)) endef +else +define ARCHIVE + echo "AR: $2" + $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } +endef +endif define CLEAN $(Q) rm -f *.o *.a diff --git a/nuttx/tools/Makefile.export b/nuttx/tools/Makefile.export index ce4842187..95a33b779 100644 --- a/nuttx/tools/Makefile.export +++ b/nuttx/tools/Makefile.export @@ -61,7 +61,7 @@ endif @echo "ARCHCFLAGS=\"$(ARCHCFLAGS) $(ARCHCPUFLAGS)\"" >> $(EXPORTDIR)/makeinfo.sh @echo "ARCHCXXFLAGS=\"$(ARCHCXXFLAGS) $(ARCHCPUFLAGS)\"" >> $(EXPORTDIR)/makeinfo.sh @echo "CROSSDEV=\"$(CROSSDEV)\"" >> $(EXPORTDIR)/makeinfo.sh - @chmod 755 $(EXPORTDIR)/makeinfo.sh + $(Q) chmod 755 $(EXPORTDIR)/makeinfo.sh clean: - @rm -f $(EXPORTDIR)/makeinfo.sh + $(Q) rm -f $(EXPORTDIR)/makeinfo.sh diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 33b7aaab2..66bea9937 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -44,34 +44,34 @@ CFLAGS = -O2 -Wall -I. # mkconfig - Convert a .config file into a C config.h file mkconfig: mkconfig.c cfgparser.c - @gcc $(CFLAGS) -o mkconfig mkconfig.c cfgparser.c + $(Q) gcc $(CFLAGS) -o mkconfig mkconfig.c cfgparser.c # cmpconfig - Compare the contents of two configuration files cmpconfig: cmpconfig.c - @gcc $(CFLAGS) -o cmpconfig cmpconfig.c + $(Q) gcc $(CFLAGS) -o cmpconfig cmpconfig.c # mkversion - Convert a .version file into a C version.h file mkversion: mkconfig.c cfgparser.c - @gcc $(CFLAGS) -o mkversion mkversion.c cfgparser.c + $(Q) gcc $(CFLAGS) -o mkversion mkversion.c cfgparser.c # mksyscall - Convert a CSV file into syscall stubs and proxies mksyscall: mksyscall.c csvparser.c - @gcc $(CFLAGS) -o mksyscall mksyscall.c csvparser.c + $(Q) gcc $(CFLAGS) -o mksyscall mksyscall.c csvparser.c # mksymtab - Convert a CSV file into a symbol table mksymtab: mksymtab.c csvparser.c - @gcc $(CFLAGS) -o mksymtab mksymtab.c csvparser.c + $(Q) gcc $(CFLAGS) -o mksymtab mksymtab.c csvparser.c # bdf-converter - Converts a BDF font to the NuttX font format bdf-converter: bdf-converter.c - @gcc $(CFLAGS) -o bdf-converter bdf-converter.c + $(Q) gcc $(CFLAGS) -o bdf-converter bdf-converter.c clean: - @rm -f *.o *.a *~ .*.swp - @rm -f mkconfig mksyscall mkversion bdf-converter - @rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -f *.o *.a *~ .*.swp + $(Q) rm -f mkconfig mksyscall mkversion bdf-converter + $(Q) rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe |