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
This commit is contained in:
patacongo
2009-06-24 20:57:34 +00:00
parent 6e759adf9e
commit 2cf61be243
8 changed files with 119 additions and 29 deletions
+4 -6
View File
@@ -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
+6 -2
View File
@@ -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