r2237 - in trunk

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: sonny_jim
Date: 2008-04-14 02:57:21 +0200 (Mon, 14 Apr 2008)
New Revision: 2237

Log:
Fix makefile, integrate cpscan into build system

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2008-04-14 00:52:02 UTC (rev 2236)
+++ trunk/config/Configure.help	2008-04-14 00:57:21 UTC (rev 2237)
@@ -3936,6 +3936,8 @@
 CONFIG_USER_PIXIL
   The PIXIL PDA GUI from www.pixil.org.
 
+CONFIG_USER_CPSCAN
+  Simple console port scanner
 #
 # END of proprietary config help
 #

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2008-04-14 00:52:02 UTC (rev 2236)
+++ trunk/config/config.in	2008-04-14 00:57:21 UTC (rev 2237)
@@ -325,6 +325,7 @@
 bool 'br2684ctl'		CONFIG_USER_BR2684CTL_BR2684CTL
 bool 'brcfg'			CONFIG_USER_BRCFG_BRCFG
 bool 'bridge utils'		CONFIG_USER_BRCTL_BRCTL
+bool 'cpscan'			CONFIG_USER_CPSCAN
 bool 'dhcpcd'			CONFIG_USER_DHCPCD_DHCPCD
 if [ "$CONFIG_USER_DHCPCD_DHCPCD" = "y" ]; then
 	bool '  dhcpcd link-local support'	CONFIG_USER_DHCPCD_LLIP

Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2008-04-14 00:52:02 UTC (rev 2236)
+++ trunk/user/Makefile	2008-04-14 00:57:21 UTC (rev 2237)
@@ -60,6 +60,7 @@
 dir_$(CONFIG_USER_CAL_DATE)                 += cal
 dir_$(CONFIG_USER_CAMSERV)                  += camserv
 dir_$(CONFIG_USER_CAN_EXAMPLES)             += can4linux
+dir_$(CONFIG_USER_CPSCAN) 	            += cpscan
 dir_$(CONFIG_USER_DICTIONARY_AMERICAN)		+= dict-words
 dir_$(CONFIG_USER_DICTIONARY_BRITISH)		+= dict-words
 dir_$(CONFIG_USER_CAN_HORCH)                += horch

Copied: trunk/user/cpscan (from rev 2236, tags/cpscan/cpscan-1.2)

Modified: trunk/user/cpscan/Makefile
===================================================================
--- tags/cpscan/cpscan-1.2/Makefile	2008-04-14 00:52:02 UTC (rev 2236)
+++ trunk/user/cpscan/Makefile	2008-04-14 00:57:21 UTC (rev 2237)
@@ -1,38 +1,6 @@
-
-CC=gcc
-STRIP=strip
-COPY=cp
-CLS=clear
-SAY=@echo
-VIEW=less
-
 default:
-	$(SAY)  "make pt (for Portuguese)(Not maintained!)"
-	$(SAY)  "make pl (for Polish)"
-	$(SAY)  "make en (for english)"
-	$(SAY)  "make no (for Norwegian)"
-	$(SAY)  "make fr (for french)"
-	$(SAY)	"make strip to strip binaries"
-	$(SAY)	"make install to install in /usr/local/bin"
-	$(SAY)  "make lic to view license."
-pt: 
-	$(CLS)
-	$(CC) -o cpscan cpscan-pt.c
-en:
-	$(CLS)
-	$(CC) -o cpscan cpscan.c
-no:	
-	$(CLS)
-	$(CC) -o cpscan cpscan-no.c
-fr:
-	$(CLS)
-	$(CC) -o cpscan cpscan-fr.c
-fr:
-	$(CLS)
-	$(CC) -o cpscan cpscan-pl.c
-install:
-	$(COPY) cpscan /usr/local/bin
-strip:	
-	$(STRIP) cpscan
-lic:
-	$(VIEW) license.txt	
+	$(CC) $(LDFLAGS) -o cpscan cpscan.c
+clean:
+	rm cpscan *.gdb *.o
+romfs:
+	$(ROMFSINST) cpscan /usr/bin