aboutsummaryrefslogtreecommitdiff
path: root/apps/system
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-02 16:04:09 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-02 16:04:09 +0000
commit7a586daed8a1ae7de992a35dac2e1b835ae746be (patch)
tree1642619d0c60b8a67c98baaca85e372bf524d8e4 /apps/system
parenta52f3af00a22c9f423afad12d623f0d3d7f5994c (diff)
downloadpx4-firmware-7a586daed8a1ae7de992a35dac2e1b835ae746be.tar.gz
px4-firmware-7a586daed8a1ae7de992a35dac2e1b835ae746be.tar.bz2
px4-firmware-7a586daed8a1ae7de992a35dac2e1b835ae746be.zip
NSH now uses the new Telnet daemon and built-in tasks started by NSH can be used over Telnet
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4361 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps/system')
-rw-r--r--apps/system/free/Makefile6
-rw-r--r--apps/system/i2c/Makefile5
-rw-r--r--apps/system/readline/Makefile6
3 files changed, 12 insertions, 5 deletions
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 51bd9a6e3..974c98913 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -61,7 +61,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
-BIN = $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(WINTOOL),y)
+ BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}"
+else
+ BIN = "$(APPDIR)/libapps$(LIBEXT)"
+endif
ROOTDEPPATH = --dep-path .
diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index 5ea974452..845c149f6 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -1,8 +1,8 @@
############################################################################
# apps/system/i2c
#
-# Copyright (C) 2011 Gregory Nutt. All rights reserved.
-# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+# 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
# modification, are permitted provided that the following conditions
@@ -42,7 +42,6 @@ include $(APPDIR)/Make.defs
ASRCS =
CSRCS = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_main.c i2c_set.c i2c_verf.c
-
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/system/readline/Makefile b/apps/system/readline/Makefile
index 3d9503cea..34fab7e81 100644
--- a/apps/system/readline/Makefile
+++ b/apps/system/readline/Makefile
@@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
-BIN = $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(WINTOOL),y)
+ BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}"
+else
+ BIN = "$(APPDIR)/libapps$(LIBEXT)"
+endif
ROOTDEPPATH = --dep-path .