r2195 - in trunk/user

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: sonny_jim
Date: 2008-04-01 17:53:12 +0200 (Tue, 01 Apr 2008)
New Revision: 2195

Log:
network grep for DSLinux

Added: trunk/user/ngrep/Makefile

Copied: trunk/user/ngrep/src (from rev 2194, tags/ngrep/ngrep-1.45)

Modified: trunk/user/ngrep/src/Makefile.in
===================================================================
--- tags/ngrep/ngrep-1.45/Makefile.in	2008-04-01 15:42:57 UTC (rev 2194)
+++ trunk/user/ngrep/src/Makefile.in	2008-04-01 15:53:12 UTC (rev 2195)
@@ -63,7 +63,7 @@
 	rm -f config.status config.cache config.log config.h Makefile 
 
 $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
-	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
+	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
 
 $(OBJS): Makefile ngrep.c ngrep.h
 

Modified: trunk/user/ngrep/src/configure
===================================================================
--- tags/ngrep/ngrep-1.45/configure	2008-04-01 15:42:57 UTC (rev 2194)
+++ trunk/user/ngrep/src/configure	2008-04-01 15:53:12 UTC (rev 2195)
@@ -3644,7 +3644,7 @@
 
 fi
 
-( cd $REGEX_DIR && ./configure )
+( cd $REGEX_DIR && CC_FOR_BUILD=gcc CFLAGS_FOR_BUILD="" ./configure --host=arm-linux-elf)
 
 
 
@@ -3661,6 +3661,10 @@
 
 case "$target_os" in
 
+*elf*)
+	OS=LINUX
+;;
+
 *linux*)
 	OS=LINUX
 

Modified: trunk/user/ngrep/src/pcre-5.0/Makefile.in
===================================================================
--- tags/ngrep/ngrep-1.45/pcre-5.0/Makefile.in	2008-04-01 15:42:57 UTC (rev 2194)
+++ trunk/user/ngrep/src/pcre-5.0/Makefile.in	2008-04-01 15:53:12 UTC (rev 2195)
@@ -65,7 +65,7 @@
 CPPFLAGS = @CPPFLAGS@
 
 CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CFLAGS_FOR_BUILD =
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 
 UCP = @UCP@
@@ -88,7 +88,7 @@
 @ON_WINDOWS at LINK = $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L.libs
 @NOT_ON_WINDOWS at LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
 LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
-LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
+LINK_FOR_BUILD = $(LIBTOOL) --mode=link --tag CC $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
 
 # These are the version numbers for the shared libraries