diff options
author | px4dev <px4@purgatory.org> | 2013-01-11 02:32:05 -0800 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-01-11 02:32:05 -0800 |
commit | 0267782782f083c53bcf49b28e4ba2ed8c28105a (patch) | |
tree | 07bae5bd37604b0af274163bd210a338bf408d54 /apps/examples/pipe | |
parent | 919d53766acb1fa6acfb9e38074666167de772e9 (diff) | |
download | px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.tar.gz px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.tar.bz2 px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.zip |
Recover changes lost to bad merging.
Diffstat (limited to 'apps/examples/pipe')
-rw-r--r-- | apps/examples/pipe/Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/apps/examples/pipe/Makefile b/apps/examples/pipe/Makefile index 956c911b3..bed319085 100644 --- a/apps/examples/pipe/Makefile +++ b/apps/examples/pipe/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/pipe/Makefile # -# Copyright (C) 2008, 2010-2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -48,10 +48,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 . @@ -70,24 +74,23 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - @( for obj in $(OBJS) ; do \ - $(call ARCHIVE, $(BIN), $${obj}); \ - done ; ) + $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built 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 |