diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-24 20:57:34 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-24 20:57:34 +0000 |
| commit | 57af094e9fea3a8e2ad7822b1c5336d0b63e4bca (patch) | |
| tree | a7c471e781e21ecdb704e78aa4ca3e1cae625ca8 /nuttx/examples | |
| parent | 38add3698930bde72d1548097b95334f0be449f1 (diff) | |
| download | px4-nuttx-57af094e9fea3a8e2ad7822b1c5336d0b63e4bca.tar.gz px4-nuttx-57af094e9fea3a8e2ad7822b1c5336d0b63e4bca.tar.bz2 px4-nuttx-57af094e9fea3a8e2ad7822b1c5336d0b63e4bca.zip | |
Fix a problem that was causing tools/incdir.sh to generate inappropriate paths for Cygwin tools
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1941 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples')
| -rw-r--r-- | nuttx/examples/nxflat/Makefile | 10 | ||||
| -rw-r--r-- | nuttx/examples/pashello/Makefile | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/nuttx/examples/nxflat/Makefile b/nuttx/examples/nxflat/Makefile index 3dd485f4d..fa740370f 100644 --- a/nuttx/examples/nxflat/Makefile +++ b/nuttx/examples/nxflat/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# examples/hello/Makefile +# examples/nxflat/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -63,17 +63,15 @@ $(BIN): headers $(OBJS) $(call ARCHIVE, $@, $${obj}); \ done ; ) -.depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ +# We can't make dependencies in this directory because the required +# header files may not yet exist. -depend: .depend +depend: clean: @rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/examples/pashello/Makefile b/nuttx/examples/pashello/Makefile index 8de5941ba..cce7b526e 100644 --- a/nuttx/examples/pashello/Makefile +++ b/nuttx/examples/pashello/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/pashello/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -36,8 +36,12 @@ -include $(TOPDIR)/.config -include $(TOPDIR)/Make.defs +ifeq ($(WINTOOL),y) +INCDIROPT = -w +endif + COMPILER = ${shell basename $(CC)} -USRINCLUDES = ${shell $(TOPDIR)/tools/incdir.sh "$CC" $(TOPDIR)/pcode/include $(TOPDIR)/pcode/insn/include} +USRINCLUDES = ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$CC" $(TOPDIR)/pcode/include $(TOPDIR)/pcode/insn/include} ifneq ($(ARCHSTDINCLUDES),) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) else |