Almost ready to ship.

diff --git a/Makefile b/Makefile
index 707233fe41c818bb03ccf3a995b27511f822fca4..2eb16958c6caa79c72626b75e44c17c0ead28f63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,35 +21,20 @@ DEVICE = OSS
 
 VERS=$(shell sed <morse.spec -n -e '/Version: \(.*\)/s//\1/p')
 
-BEEPERS = beepLinux.c beepOSS.c beepX11.c
-SOURCES = alarm.c  morse.c alarm.h beep.h $(BEEPERS)
 MANPAGES = morse.1 QSO.1 
 DOCS = README HISTORY morse.xml morse.spec $(MANPAGES)
-ALL=  $(DOCS) Makefile $(SOURCES) test_input qso.d/*.[ch] qso.d/Makefile
-
-# The flags necessary to link with the X11 libraries.
-X11LIBS = -L/usr/X11/lib -lX11
-
-# Any additional flags your favorite C compiler requires to work.
-CFLAGS  = -O3 ${DEFINES}
+ALL=  $(DOCS) Makefile $(SOURCES) test_input \
+       morse.d/*.[ch] morse.d/Makefile \
+       qso.d/*.[ch] qso.d/Makefile
 
 default:
-       make test
+       make testmorse
 
 all: morse QSO morse.1 QSO.1
 
-morse: morse${DEVICE}
-       rm -f $@
-       ln morse${DEVICE} $@
-
-morseX11:      morse.o beepX11.o alarm.o
-       $(CC) -o $@ morse.o beepX11.o alarm.o $(X11LIBS)
-
-morseLinux:    morse.o beepLinux.o alarm.o
-       $(CC) -o $@ morse.o beepLinux.o alarm.o -lm
-
-morseOSS:      morse.o beepOSS.o
-       $(CC) $(CFLAGS) -o $@ morse.o beepOSS.o -lm
+morse:
+       cd morse.d && make DEVICE=${DEVICE}
+       ln morse.d/morse ./morse
 
 QSO:
        cd qso.d && make
@@ -63,7 +48,7 @@ QSO:
 # letter exactly once. He rejected it because it contains "BMW", alas, but
 # he did say it's the closest he's seen so far. - Joe Dellinger
 #
-test:  morse QSO
+testmorse:     morse QSO
        (cat test_input; qso.d/QSO) | morse -w 24 -l -e
 
 testqso:       morse QSO
@@ -72,18 +57,13 @@ testqso:    morse QSO
 all:   morse QSO
 
 clean:
-       rm -f *.o morse QSO morseX11 morseLinux morseOSS
+       rm -f morse QSO
+       cd morse.d; make clean
        cd qso.d; make clean
 
 pristine: clean
        rm -f $(MANPAGES)
 
-morse.o:       beep.h Makefile
-beepX11.o:     beep.h alarm.h
-beepLinux.o:   beep.h alarm.h
-beepOSS.o:     beep.h
-alarm.o:       alarm.h
-
 morse.1: morse.xml
        xmlto man morse.xml
 

diff --git a/morse.spec b/morse.spec
index 8ad0a2981f5349d6ffeba9501f5ae8175b270da9..1edf9f368d42575f6a6380068051613211848c52 100644 (file)
--- a/morse.spec
+++ b/morse.spec
@@ -7,6 +7,7 @@ Group: Communications
 URL: http://catb.org/~esr/morse/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
+#Destinations: mailto:geojoe@freeusp.org, mailto:pjd@cs.tufts.edu, mailto:jmaynard@conmicro.cx
 
 %description 
 morse is a Morse-code training program for aspiring radio hams.  It
@@ -41,5 +42,5 @@ cp morse.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 
 %changelog
 * Mon Jan 24 2005 Eric S. Raymond <esr@snark.thyrsus.com> - 
-- Initial build.  See HISTORY file for prior history.
+- Initial build.  See HISTORY file in the distribution for prior history.