Rename "makelx" to "writelx"

.gitignore

@@ -66,7 +66,7 @@ util/genlds
 util/host/mkimg
 util/ir-server
 util/lnpmsg
-util/makelx
+util/writelx
 xs/lisp/xsout-rcx
 xs/xs
 xs/xs-host

CONTRIBUTORS

@@ -28,6 +28,9 @@ Matthew Sheets (mesheets@users.sourceforge.net)
   Enabled more flexible communication options for downloading firmware
   Modified conio to remove the CONF_ASCII dependency from CONF_PROGRAM
   Updated Makefiles to support building programs written in Esterel
+  Enable configurable package/kernel naming
+  Refactor "makelx" to "writelx"
+  Various code cleanups...
 
 Carl Troein (troein@users.sourceforge.net)
   Fixed signedness and constness warnings
@@ -116,7 +119,7 @@ Paolo Masetti (paolo.masetti@itlug.org)
   Added/Updated Cygwin support (B-20 and 1.x)
 
 Stephen M Moraco (stephen@debian.org)
-  Small makelx c++ fix (ctor/dtor alloc), created manpages for dll(1)
+  Small writelx (formerly makelx) c++ fix (ctor/dtor alloc), created manpages for dll(1)
   and firmdl3(1), added inline API documentation extractable by Doxygen
 
 and many people testing and submitting fix requests including (but
@@ -138,7 +141,7 @@ Stig Neilsson (spiff@rhk.dk)
   Extremely thorough kernel documentation.
 
 John Markus Bjorndalen (johnm@cs.uit.no)
-  Small makelx fix for gcc 2.96 (RH 7.0).
+  Small writelx (formerly makelx) fix for gcc 2.96 (RH 7.0).
 
 V0.2.4
 ---------

Makefile.common

@@ -65,7 +65,7 @@ CROSSCXX=$(CROSSTOOLPREFIX)g++
 MERGEMAP=util/merge-map$(EXT)
 FIXDEPS	=util/fixdeps$(EXT)
 GENLDS 	=util/genlds$(EXT)
-MAKELX	=util/makelx$(EXT)
+WRITELX	=util/writelx$(EXT)
 
 ### --------------------------------------------------------------------------
 ###                         End of FILE: Makefile.common

Makefile.dist

@@ -23,18 +23,18 @@ COPT   = -g -Os -fno-builtin -fomit-frame-pointer
 CWARN  = -Wall
 CINC   = -I$(INCLUDEDIR)
 CFLAGS = $(COPT) $(CWARN) $(CINC)
-CROSSCFLAGS=$(COPT) -mquickcall $(CWARN) $(CINC) $(CDEFINES)
-CROSSCXXFLAGS=-DCXX -fno-rtti -fno-exceptions $(CROSSCFLAGS)
-
-CROSSAS=$(CROSSTOOLPREFIX)as
-CROSSAR=$(CROSSTOOLPREFIX)ar
-CROSSLD=$(CROSSTOOLPREFIX)ld
-CROSSNM=$(CROSSTOOLPREFIX)nm
-CROSSOBJCOPY=$(CROSSTOOLPREFIX)objcopy
-CROSSOBJDUMP=$(CROSSTOOLPREFIX)objdump
-CROSSCC= $(CROSSTOOLPREFIX)gcc
-CROSSCXX= $(CROSSTOOLPREFIX)g++
-MAKELX=$(BINDIR)/makelx
+CROSSCFLAGS = $(COPT) -mquickcall $(CWARN) $(CINC) $(CDEFINES)
+CROSSCXXFLAGS = -DCXX -fno-rtti -fno-exceptions $(CROSSCFLAGS)
+
+CROSSAS  = $(CROSSTOOLPREFIX)as
+CROSSAR  = $(CROSSTOOLPREFIX)ar
+CROSSLD  = $(CROSSTOOLPREFIX)ld
+CROSSNM  = $(CROSSTOOLPREFIX)nm
+CROSSOBJCOPY = $(CROSSTOOLPREFIX)objcopy
+CROSSOBJDUMP = $(CROSSTOOLPREFIX)objdump
+CROSSCC  = $(CROSSTOOLPREFIX)gcc
+CROSSCXX = $(CROSSTOOLPREFIX)g++
+WRITELX  = $(BINDIR)/writelx
 
 
 include $(DATADIR)/Makefile.user

Makefile.user

@@ -90,22 +90,22 @@ LIBDIR?=lib
 	rm -f $@
 	$(CROSSAR) -sq $@ $^ $(_SRC_OBJS)
 
-#  How to make coff files of dynamic executables (twice, for makelx)
+#  How to make coff files of dynamic executables (twice, for writelx)
 %.dc1: %.o %.a $(CROSSLIBS:-l%=$(LIBDIR)/lib%.a) $(KERNEL).lds
 	$(CROSSLD) $(DLDFLAGS) $*.o $*.a $(CROSSLIBS) -o $@ --oformat coff-h8300 -Ttext $(call GET_BASE,BASE1)
 
 %.dc2: %.o %.a $(CROSSLIBS:-l%=$(LIBDIR)/lib%.a) $(KERNEL).lds
 	$(CROSSLD) $(DLDFLAGS) $*.o $*.a $(CROSSLIBS) -o $@ --oformat coff-h8300 -Ttext $(call GET_BASE,BASE2)
 
-#  How to make srec files from coff files (twice, for makelx)
+#  How to make srec files from coff files (twice, for writelx)
 %.ds2: %.dc2
 	$(CROSSOBJCOPY) -I coff-h8300 -O symbolsrec $< $@
 
 %.ds1: %.dc1
 	$(CROSSOBJCOPY) -I coff-h8300 -O symbolsrec $< $@
 
-%.lx: %.ds1 %.ds2 $(MAKELX)
-	$(MAKELX) $*.ds1 $*.ds2 $@
+%.lx: %.ds1 %.ds2 $(WRITELX)
+	$(WRITELX) $*.ds1 $*.ds2 $@
 
 ### --------------------------------------------------------------------------
 ###                          End of FILE: Makefile.user

util/host/Makefile.sub

@@ -9,33 +9,33 @@ FIRMDLTARGET=firmdl$(EXT)
 FIRMDLMAN1=firmdl.1
 LNPMSGTARGET=lnpmsg$(EXT)
 IRSRVRTARGET=ir-server$(EXT)
-DLLALLTARGETS=dll$(EXT) makelx$(EXT) genlds$(EXT)
+DLLALLTARGETS=dll$(EXT) writelx$(EXT) genlds$(EXT)
 DLLALLMAN1=dll.1
 MKIMG := util/host/mkimg$(EXT)
 
 RCX_COMM_SRCS = rcx_comm.c lnp-logical.c lnp.c
 
-FONTSRC   = fontdesign.c
-FIRMDLSRC = firmdl.c srec.c srecload.c $(RCX_COMM_SRCS)
-MKIMGSRC  = mkimg.c srec.c srecload.c
-LNPMSGSRC = lnpmsg.c lnpmsg_comm.c $(RCX_COMM_SRCS)
-DLLSRC    = loader.c lx.c $(RCX_COMM_SRCS)
-MAKELXSRC = convert.c srec.c srecload.c lx.c
-IRSRVRSRC = ir-server.c $(RCX_COMM_SRCS)
-GENLDSSRC = genlds.c
-
-FONTOBJS   := $(FONTSRC:%.c=util/host/%.o)
-FIRMDLOBJS := $(FIRMDLSRC:%.c=util/host/%.o)
-MKIMGOBJS  := $(MKIMGSRC:%.c=util/host/%.o)
-LNPMSGOBJS := $(LNPMSGSRC:%.c=util/host/%.o)
-DLLOBJS    := $(DLLSRC:%.c=util/host/%.o)
-MAKELXOBJS := $(MAKELXSRC:%.c=util/host/%.o)
-IRSRVROBJS := $(IRSRVRSRC:%.c=util/host/%.o)
-GENLDSOBJS := $(GENLDSSRC:%.c=util/host/%.o)
+FONTSRC    = fontdesign.c
+FIRMDLSRC  = firmdl.c srec.c srecload.c $(RCX_COMM_SRCS)
+MKIMGSRC   = mkimg.c srec.c srecload.c
+LNPMSGSRC  = lnpmsg.c lnpmsg_comm.c $(RCX_COMM_SRCS)
+DLLSRC     = loader.c lx.c $(RCX_COMM_SRCS)
+WRITELXSRC = convert.c srec.c srecload.c lx.c
+IRSRVRSRC  = ir-server.c $(RCX_COMM_SRCS)
+GENLDSSRC  = genlds.c
+
+FONTOBJS    := $(FONTSRC:%.c=util/host/%.o)
+FIRMDLOBJS  := $(FIRMDLSRC:%.c=util/host/%.o)
+MKIMGOBJS   := $(MKIMGSRC:%.c=util/host/%.o)
+LNPMSGOBJS  := $(LNPMSGSRC:%.c=util/host/%.o)
+DLLOBJS     := $(DLLSRC:%.c=util/host/%.o)
+WRITELXOBJS := $(WRITELXSRC:%.c=util/host/%.o)
+IRSRVROBJS  := $(IRSRVRSRC:%.c=util/host/%.o)
+GENLDSOBJS  := $(GENLDSSRC:%.c=util/host/%.o)
 
 
 DISTFILES += $(patsubst %,util/host/%, Makefile.sub $(sort $(FONTSRC) $(FIRMDLSRC) \
-        $(MKIMGSRC) $(LNPMSGSRC) $(DLLSRC) $(MAKELXSRC) $(IRSRVRSRC) $(GENLDSSRC) \
+        $(MKIMGSRC) $(LNPMSGSRC) $(DLLSRC) $(WRITELXSRC) $(IRSRVRSRC) $(GENLDSSRC) \
         config.h fastdl.S srec.h srecload.h lx.h rcx_comm.h lnpmsg_comm.h \
         $(DLLALLMAN1) $(FIRMDLMAN1) ))
 DISTFILES := $(filter-out util/host/lnp.c util/host/lnp-logical.c, $(DISTFILES))
@@ -75,7 +75,7 @@ util/host/lnp-logical.o: kernel/lnp-logical.c
 	$(CC) -MMD $(CFLAGS) -c -o $@ $^
 
 NATIVEOBJS+=$(patsubst util/host/lnp.o,, $(patsubst util/host/lnp-logical.o,, $(sort $(FONTOBJS) \
-    $(FIRMDLOBJS) $(MKIMGOBJS) $(LNPMSGOBJS) $(DLLOBJS) $(MAKELXOBJS) $(IRSRVROBJS) $(GENLDSOBJS))))
+    $(FIRMDLOBJS) $(MKIMGOBJS) $(LNPMSGOBJS) $(DLLOBJS) $(WRITELXOBJS) $(IRSRVROBJS) $(GENLDSOBJS))))
 
 util/host/firmdl.o: util/host/fastdl_2400.h util/host/fastdl_4800.h util/host/fastdl_9600.h util/host/fastdl_19200.h  util/host/fastdl_38400.h
 
@@ -112,7 +112,7 @@ util/$(IRSRVRTARGET): $(IRSRVROBJS)
 
 util/dll$(EXT): $(DLLOBJS)
 	$(CC) -o $@ $^ $(LIBS) $(CFLAGS)
-$(MAKELX): $(MAKELXOBJS)
+$(WRITELX): $(WRITELXOBJS)
 	$(CC) -o $@ $^ $(LIBS) $(CFLAGS)
 $(GENLDS): $(GENLDSOBJS)
 	$(CC) -o $@ $^ $(LIBS) $(CFLAGS)