diff options
| author | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
| commit | 854c6436b4e3b292fd04843795d0369dc8856783 (patch) | |
| tree | 4d5602f5c70926d2dcd01294561ddd8df4378462 /nuttx/syscall/Makefile | |
| parent | 6d138a845aabad31060bd00da0d20d177d3f4be4 (diff) | |
| parent | c38ad4ded570eddadeeca3579d02dfc63dcc8a9d (diff) | |
| download | px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.gz px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.bz2 px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.zip | |
Pull NuttX up to the 6.24 release.
Merge branch 'nuttx-merge-5447'
Diffstat (limited to 'nuttx/syscall/Makefile')
| -rw-r--r-- | nuttx/syscall/Makefile | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/nuttx/syscall/Makefile b/nuttx/syscall/Makefile index 88365759d..4556912be 100644 --- a/nuttx/syscall/Makefile +++ b/nuttx/syscall/Makefile @@ -1,7 +1,7 @@ ############################################################################ # syscall/Makefile # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -34,11 +34,13 @@ ########################################################################### -include $(TOPDIR)/Make.defs -include proxies/Make.defs -include stubs/Make.defs +DELIM ?= $(strip /) -MKSYSCALL = "$(TOPDIR)/tools/mksyscall$(EXEEXT)" -CSVFILE = "$(TOPDIR)/syscall/syscall.csv" +include proxies$(DELIM)Make.defs +include stubs$(DELIM)Make.defs + +MKSYSCALL = "$(TOPDIR)$(DELIM)tools$(DELIM)mksyscall$(EXEEXT)" +CSVFILE = "$(TOPDIR)$(DELIM)syscall$(DELIM)syscall.csv" STUB_SRCS += stub_lookup.c @@ -72,42 +74,43 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN1): $(PROXY_OBJS) - @( for obj in $(PROXY_OBJS) ; do \ - $(call ARCHIVE, $@, $${obj}); \ - done ; ) + $(call ARCHIVE, $@, $(PROXY_OBJS)) $(BIN2): $(STUB_OBJS) - @( for obj in $(STUB_OBJS) ; do \ - $(call ARCHIVE, $@, $${obj}); \ - done ; ) + $(call ARCHIVE, $@, "$(STUB_OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend $(MKSYSCALL): - @$(MAKE) -C $(TOPDIR)/tools -f Makefile.host mksyscall + $(Q) $(MAKE) -C $(TOPDIR)$(DELIM)tools -f Makefile.host mksyscall .context: syscall.csv - @(cd proxies; $(MKSYSCALL) -p $(CSVFILE);) - @(cd stubs; $(MKSYSCALL) -s $(CSVFILE);) - @touch $@ + $(Q) (cd proxies; $(MKSYSCALL) -p $(CSVFILE);) + $(Q) (cd stubs; $(MKSYSCALL) -s $(CSVFILE);) + $(Q) touch $@ context: $(MKSYSCALL) .context clean: - @rm -f $(BIN1) $(BIN2) *~ .*.swp + $(call DELFILE, $(BIN1)) + $(call DELFILE, $(BIN2)) ifneq ($(OBJEXT),) - @rm -f proxies/*$(OBJEXT) stubs/*$(OBJEXT) + $(call DELFILE, proxies$(DELIM)*$(OBJEXT)) + $(call DELFILE, stubs$(DELIM)*$(OBJEXT)) endif $(call CLEAN) distclean: clean - @rm -f Make.dep .depend .context - @rm -f proxies/*.c stubs/*.c + $(call DELFILE, .context) + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + $(call DELFILE, proxies$(DELIM)*.c) + $(call DELFILE, stubs$(DELIM)*.c) -include Make.dep |