From 105a59fa90e7dd9f7cd2bea774d99e60c3562fa8 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 16 Apr 2011 15:43:39 +0000
Subject: THTTPD works on LPCXpresso

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3514 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/netutils/thttpd/cgi-src/Makefile | 46 +++++++++++++++++++----------------
 apps/nshlib/nsh_parse.c               |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

(limited to 'apps')

diff --git a/apps/netutils/thttpd/cgi-src/Makefile b/apps/netutils/thttpd/cgi-src/Makefile
index 3f025dec3..46b41fd62 100644
--- a/apps/netutils/thttpd/cgi-src/Makefile
+++ b/apps/netutils/thttpd/cgi-src/Makefile
@@ -36,40 +36,44 @@
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(APPDIR)/netutils/thttpd -I$(APPDIR)/netutils/thttpd/cgi-src
+ifeq ($(WINTOOL),y)
+INCDIROPT	= -w
+endif
+
+CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
 CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
 CLEANFILES	= *.o redirect ssi phf
 
-BIN1			= phf
-BIN2			= redirect
-BIN3			= ssi
-BIN				= $(BIN1) $(BIN2) $(BIN3)
+BIN1		= phf
+BIN2		= redirect
+BIN3		= ssi
+BIN			= $(BIN1) $(BIN2) $(BIN3)
 
-R1SRCS1			= $(BIN1).c
-R1OBJS1			= $(R1SRCS1:.c=.o)
-R2SRC1			= $(BIN1)-thunk.S
-R2OBJ1			= $(R2SRC1:.S=.o)
+R1SRCS1		= $(BIN1).c
+R1OBJS1		= $(R1SRCS1:.c=.o)
+R2SRC1		= $(BIN1)-thunk.S
+R2OBJ1		= $(R2SRC1:.S=.o)
 
-R1SRCS2			= $(BIN2).c
-R1OBJS2			= $(R1SRCS2:.c=.o)
-R2SRC2			= $(BIN2)-thunk.S
-R2OBJ2			= $(R2SRC2:.S=.o)
+R1SRCS2		= $(BIN2).c
+R1OBJS2		= $(R1SRCS2:.c=.o)
+R2SRC2		= $(BIN2)-thunk.S
+R2OBJ2		= $(R2SRC2:.S=.o)
 
-R1SRCS3			= $(BIN3).c
-R1OBJS3			= $(R1SRCS3:.c=.o)
-R2SRC3			= $(BIN3)-thunk.S
-R2OBJ3			= $(R2SRC3:.S=.o)
+R1SRCS3		= $(BIN3).c
+R1OBJS3		= $(R1SRCS3:.c=.o)
+R2SRC3		= $(BIN3)-thunk.S
+R2OBJ3		= $(R2SRC3:.S=.o)
 
-DERIVED			= $(R2SRC1) $(R2SRC2) $(R2SRC3)
+DERIVED		= $(R2SRC1) $(R2SRC2) $(R2SRC3)
 
-R1COBJS			= $(R1OBJS1) $(R1OBJS2) $(R1OBJS3)
-R2AOBJS			= $(R2OBJ1) $(R2OBJ2) $(R2OBJ3)
+R1COBJS		= $(R1OBJS1) $(R1OBJS2) $(R1OBJS3)
+R2AOBJS		= $(R2OBJ1) $(R2OBJ2) $(R2OBJ3)
 
 all: $(BIN1) $(BIN2) $(BIN3)
 
 $(R1COBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2AOBJS): %.o: %.S
 	@echo "AS: $<"
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index a4c3c893d..650ef5732 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -348,7 +348,7 @@ static const struct cmdmap_s g_cmdmap[] =
  */
 
 #if CONFIG_VERSION_MAJOR != 0 || CONFIG_VERSION_MINOR != 0
-const char g_nshgreeting[]       = "\nNuttShell (NSH) NuttX-" CONFIG_VERSION_STRING "\n
+const char g_nshgreeting[]       = "\nNuttShell (NSH) NuttX-" CONFIG_VERSION_STRING "\n";
 #else
 const char g_nshgreeting[]       = "\nNuttShell (NSH)\n";
 #endif
-- 
cgit v1.2.3