r1804 - in trunk

[stsp at dslinux.in-berlin.de]

Author: stsp
Date: 2007-06-24 12:51:45 +0200 (Sun, 24 Jun 2007)
New Revision: 1804

Log:
Port of lcalc by Dualscreenman with minor modifications by me.


Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2007-06-24 10:03:22 UTC (rev 1803)
+++ trunk/config/Configure.help	2007-06-24 10:51:45 UTC (rev 1804)
@@ -491,6 +491,9 @@
 CONFIG_USER_HEXEDIT_HEXEDIT
   A nice hex editor
 
+CONFIG_USER_LCALC_LCALC
+  A simple, 4 function calculator
+
 CONFIG_USER_ROUTE_IFCONFIG
   Required to configure network interfaces.
   Approx. binary size: 28k

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-06-24 10:03:22 UTC (rev 1803)
+++ trunk/config/config.in	2007-06-24 10:51:45 UTC (rev 1804)
@@ -786,6 +786,7 @@
 bool 'grep'			CONFIG_USER_GREP_GREP
 bool 'hd'			CONFIG_USER_HD_HD
 bool 'hexedit'			CONFIG_USER_HEXEDIT_HEXEDIT
+bool 'lcalc'			CONFIG_USER_LCALC_LCALC
 bool 'lcd'			CONFIG_USER_LCD_LCD
 bool 'ledcon'			CONFIG_USER_LEDCON_LEDCON
 bool 'lha'			CONFIG_USER_LHA_LHA

Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2007-06-24 10:03:22 UTC (rev 1803)
+++ trunk/user/Makefile	2007-06-24 10:51:45 UTC (rev 1804)
@@ -176,6 +176,7 @@
 dir_$(CONFIG_USER_KLAXON_KLAXON)            += klaxon
 dir_$(CONFIG_USER_L2TPD_L2TPD)              += l2tpd
 dir_$(CONFIG_USER_LANG_A60)                 += a60
+dir_$(CONFIG_USER_LCALC_LCALC)              += lcalc
 dir_$(CONFIG_USER_LCD_LCD)                  += lcd
 dir_$(CONFIG_USER_LEDCON_LEDCON)            += ledcon
 dir_$(CONFIG_USER_LEVEE_VI)                 += levee

Copied: trunk/user/lcalc (from rev 1802, tags/lcalc/lcalc-1.0)

Modified: trunk/user/lcalc/Lcalc.c
===================================================================
--- tags/lcalc/lcalc-1.0/Lcalc.c	2007-06-24 09:27:32 UTC (rev 1802)
+++ trunk/user/lcalc/Lcalc.c	2007-06-24 10:51:45 UTC (rev 1804)
@@ -27,13 +27,13 @@
 int oper4(void);
 
 	
-		main(int argv, char *argc[])
+int		main(int argv, char *argc[])
 
 {
 
 
 
-		int choice;
+		int choice = 0;
 				while(choice != QUIT_PROG)
 				{
 				choice = get_menu_choice();
@@ -88,6 +88,8 @@
 printf("\033[40;47;00m");
  
   }
+
+return 0;
 }
 
 
@@ -130,7 +132,6 @@
 {
 
 
-		char buffer[256];
 		int a,b,c;
 
 
@@ -156,7 +157,6 @@
 {
 
 	
-		char buffer[256];
 			int a,b,c;
 
 	printf("\n\t\t\tEnter a number value: ");
@@ -187,7 +187,6 @@
 
 {
 
-	char buffer[256];
 		int a,b,c;
 
 
@@ -218,7 +217,6 @@
 
 {
 
-		char buffer[256];
 		int a,b,c;
 
 

Modified: trunk/user/lcalc/Makefile
===================================================================
--- tags/lcalc/lcalc-1.0/Makefile	2007-06-24 09:27:32 UTC (rev 1802)
+++ trunk/user/lcalc/Makefile	2007-06-24 10:51:45 UTC (rev 1804)
@@ -1,17 +1,15 @@
 #Simple Makefile for LCalc
+#Modified by Dualscreenman to compile for DSLinux
+#(removed forced definition of CC, added $(CC) and $(LDFLAGS) to the compile string.
 
-#For Linux systems
+EXEC = lcalc
 
-CC = gcc
 
+$(EXEC): Lcalc.c
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) Lcalc.c
 
+romfs:
+	$(ROMFSINST) /bin/$(EXEC)
 
-Lcalc:
-		gcc -O6 -O2 -O -o Lcalc Lcalc.c
-
-
-
-install:
-		cp  Lcalc /usr/sbin ; chmod 4755 /usr/sbin/Lcalc
-
-
+clean:
+	rm -f $(EXEC) $(EXEC).gdb