First step: compile without errors, decent test production.

diff --git a/Makefile b/Makefile
index 10f8603e85c9c815c642df3a8dfdbaef1ff628ff..08e22c5d416f870d0101ebf70a66ac199c132546 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,9 @@
 #DEVICE = HP
 #DEVICE = X11
 #DEVICE = Indigo
-DEVICE = Linux
+#DEVICE = Linux
 #DEVICE = AdLib
-#DEVICE = OSS
+DEVICE = OSS
 
 #
 # For termio a la System V, add -DUSG to DEFINES. (Linux in particular needs
@@ -68,11 +68,13 @@ CC  = gcc
 
 # Any additional flags your favorite C compiler requires to work.
 #CFLAGS  = -O -I/usr/X11/include -DSVR4 -DSYSV386 ${DEFINES}
-CFLAGS  = -O3 -m486 ${DEFINES}
+CFLAGS  = -O3 -march=i486 ${DEFINES}
 
 default:
        make test
 
+all: morse QSO morse.1
+
 morse: morse${DEVICE}
        rm -f $@
        ln morse${DEVICE} $@
@@ -114,23 +116,17 @@ QSO:
 # he did say it's the closest he's seen so far. - Joe Dellinger
 #
 test:  morse QSO
-       \rm -f junk
-       cat test_input > junk
-       qso/QSO >> junk
-       # ./morse -v .04 -w 24 -l -e < junk
-       \rm -f junk
+       (cat test_input; qso/QSO) | morse -w 24 -l -e
 
 testqso:       morse QSO
-       qso/QSO | ./morse -v .04 -w 20 -l -e
+       qso/QSO | ./morse -w 20 -l -e
 
 all:   morse QSO
 
 clean:
        rm -f *.o morse QSO morseSun morseHP morseX11 morseIndigo morseLinux morseAdLib morseOSS
-       rm -f junk
        cd qso; make clean
 
-
 morse.o:       beep.h Makefile
 beepSun.o:     beep.h
 beepHP.o:      beep.h alarm.h

diff --git a/beep.h b/beep.h
index 2de914eaef40d9756c319beaa6a268b9187df1ee..18185b8866c0869eddb422fd9507d9582f70cbb1 100644 (file)
--- a/beep.h
+++ b/beep.h
@@ -12,7 +12,7 @@
 -- Called exactly once, before any other function in this interface.
 -- Returns nonzero on error.
 */
-int BeepInit();
+int BeepInit(void);
 
 
 /*
@@ -56,4 +56,4 @@ int BeepCleanup();
 int BeepResume();
 
 
-#endif _BEEP_H
+#endif /* _BEEP_H */