diff options
author | James Goppert <james.goppert@gmail.com> | 2013-01-17 10:50:08 -0500 |
---|---|---|
committer | James Goppert <james.goppert@gmail.com> | 2013-01-17 10:50:08 -0500 |
commit | 612385a23132dfadd8443774e1ff76ecdd1987c9 (patch) | |
tree | 4a1fb370c6098722983fcc020ed7040d5d454577 /apps/examples/ostest/Makefile | |
parent | 34d70bea4bb2a1719e4d081cf59081b84037d423 (diff) | |
parent | 7d7c352fb44b718cb96096a624a19b5225e39f92 (diff) | |
download | px4-firmware-612385a23132dfadd8443774e1ff76ecdd1987c9.tar.gz px4-firmware-612385a23132dfadd8443774e1ff76ecdd1987c9.tar.bz2 px4-firmware-612385a23132dfadd8443774e1ff76ecdd1987c9.zip |
Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection
Diffstat (limited to 'apps/examples/ostest/Makefile')
-rw-r--r-- | apps/examples/ostest/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index 374964b39..3e78c64e8 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -98,10 +98,14 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else ifeq ($(WINTOOL),y) - BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" + BIN = ..\\..\\libapps$(LIBEXT) else - BIN = "$(APPDIR)/libapps$(LIBEXT)" + BIN = ../../libapps$(LIBEXT) +endif endif ROOTDEPPATH = --dep-path . @@ -120,9 +124,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - @( for obj in $(OBJS) ; do \ - $(call ARCHIVE, $(BIN), $${obj}); \ - done ; ) + $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built .context: @@ -134,16 +136,17 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend clean: - @rm -f *.o *~ .*.swp .built + $(call DELFILE, .built) $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) -include Make.dep |