summaryrefslogtreecommitdiff
path: root/libc/conio
diff options
context:
space:
mode:
Diffstat (limited to 'libc/conio')
-rw-r--r--libc/conio/Makefile22
-rw-r--r--libc/conio/conio.c7
-rw-r--r--libc/conio/cprintf.c5
3 files changed, 19 insertions, 15 deletions
diff --git a/libc/conio/Makefile b/libc/conio/Makefile
index bd86b2c..662b0ec 100644
--- a/libc/conio/Makefile
+++ b/libc/conio/Makefile
@@ -3,19 +3,23 @@
# under the GNU Library General Public License.
ASRC=conio.c
-AOBJ=getch.o getche.o kbhit.o putch.o cputs.o
+AOBJ=getch.o getche.o kbhit.o putch.o
-OBJ=$(AOBJ) cprintf.o
+BSRC=conio.c
+BOBJ=cputs.o
+
+BIOSOBJ=$(BOBJ) cprintf.o
+DOSOBJ=$(AOBJ) $(BOBJ) cprintf.o
CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
ifeq ($(LIB_CPU)-$(LIB_OS),i86-BIOS)
-all: $(LIBC)($(OBJ))
- @$(RM) $(OBJ)
+all: $(LIBC)($(BIOSOBJ))
+ @$(RM) $(BIOSOBJ)
else
ifeq ($(LIB_CPU)-$(LIB_OS),i86-DOS)
-all: $(LIBC)($(OBJ))
- @$(RM) $(OBJ)
+all: $(LIBC)($(DOSOBJ))
+ @$(RM) $(DOSOBJ)
else
all:
@:
@@ -26,11 +30,13 @@ $(LIBC)($(AOBJ)): $(ASRC)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(AR) $(ARFLAGS) $@ $*.o
+$(LIBC)($(BOBJ)): $(BSRC)
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+ $(AR) $(ARFLAGS) $@ $*.o
+
$(LIBC)(cprintf.o): cprintf.c
$(CC) -c -ansi $(ARCH) $(CCFLAGS) $(DEFS) $*.c
$(AR) $(ARFLAGS) $@ $*.o
-
-
clean:
rm -f *.o libc.a
diff --git a/libc/conio/conio.c b/libc/conio/conio.c
index c0e9cbb..ee311a5 100644
--- a/libc/conio/conio.c
+++ b/libc/conio/conio.c
@@ -58,13 +58,6 @@ putch()
mov bx,sp
mov ax,[bx+2]
#endif
- cmp al,#$0A
- jne not_nl
- mov ax,#$0E0D
- mov bx,#7
- int $10
- mov al,#$0A
-not_nl:
mov ah,#$0E
mov bx,#7
int $10
diff --git a/libc/conio/cprintf.c b/libc/conio/cprintf.c
index 4bc3bac..5194376 100644
--- a/libc/conio/cprintf.c
+++ b/libc/conio/cprintf.c
@@ -1,3 +1,8 @@
+/* Copyright (C) 1999-2002 Robert de Bath <rdebath@cix.co.uk>
+ * This file is part of the Linux-8086 C library and is distributed
+ * under the GNU Library General Public License.
+ */
+
#include <stdarg.h>
#include <conio.h>