Fix Makefile

3 files changed, 6 insertions, 78 deletions

diff --git a/.gitignore b/.gitignore
index 50ab4de..2d798a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+1
+2
+3
+4
 obj/*
 1.*
 2.*
diff --git a/Makefile b/Makefile
index d016e10..6377c1e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ TESTXEX=fnchat-$(shell date +%Y%m%d-%H%M).xex
 ATASM=atasm -s -a
 
 all: clean fnchat.xex
-	cp fnchat.xex /var/tnfs/
+	[ -d /var/tnfs ] && cp fnchat.xex /var/tnfs/ || true
 
 fnchat.xex: $(PARTS)
 	cat $(PARTS) > fnchat.xex
@@ -20,7 +20,7 @@ config/config.xex:
 	$(MAKE) -C config
 
 clean:
-	rm -f $(PARTS) *.o
+	rm -f $(PARTS) *.o src/*.o obj/atari/*.o config/*.o fnchat.xex
 	$(MAKE) -f Makefile.client clean
 
 %.xex: %.asm
diff --git a/uitest/test.c b/uitest/test.c
deleted file mode 100644
index 5e13559..0000000
--- a/uitest/test.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <atari.h>
-#include <stdio.h>
-#include <conio.h>
-#include <string.h>
-#include "../src/screen.h"
-#include "../src/edbox.h"
-
-void got_line(void) {
-	scr_print(SCR_CURR, edit_box);
-	scr_putc(SCR_CURR, '\n');
-}
-
-int main() {
-	char i, s;
-	char buf[40];
-
-	OS.color2 = 0xc2;
-	OS.color1 = 0x0e;
-
-	scr_init();
-	edbox_callback = got_line;
-
-	/*
-	for(i = 0; i < 4; i++) {
-		sprintf(buf, "screen%d", i);
-		s = scr_create(buf, 0);
-		scr_set_topic(s + 1, "This is screen #%d.");
-	}
-	*/
-
-	for(i = 0; i < 19; i++) {
-		sprintf(buf, "line %d\n", i);
-		scr_print(0, buf);
-	}
-
-	scr_print_current("login:\n");
-	strcpy(buf, "Urchlay");
-	edbox_readline(buf, sizeof(buf));
-	scr_print_current("You are logged in as ");
-	scr_print_current(buf);
-
-	scr_print_current("Hold Start and press:\n");
-	scr_print_current("N: Create new screen, C: Close screen\n");
-	scr_print_current("1-7: Switch to screen (if exists).\n");
-	scr_print_current("To enter text, just start typing.\n");
-
-	while(1) {
-		if(OS.ch != 0xff) {
-			if(GTIA_READ.consol == 6) { /* start pressed */
-				i = cgetc();
-				if(i == 's') {
-					scr_scrollback();
-					cgetc();
-					scr_end_scrollback();
-				} else if(i >= '1' && i <= '7') {
-					if(scr_status[i - '1'] != SCR_UNUSED)
-						scr_display(i - '1');
-				} else if(i == 'n') {
-					s = scr_create("new screen", 1);
-					if(s != 0xff) {
-						scr_print(0, "Screen #");
-						scr_putc(0, s + '1');
-						scr_print(0, " created.\n");
-					} else {
-						scr_print(scr_current, "Can't create screen (all in use)\n");
-					}
-				} else if(i == 'c') {
-					scr_destroy(scr_current);
-				}
-			} else {
-				edbox_keystroke();
-			}
-		}
-	}
-	return 0;
-}