Merge pull request #360 from Interlisp/fixups-for-INIT-handling

Improve process for building ldeinit

bin/makefile-cygwin.x86_64-x

@@ -25,4 +25,4 @@ LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-freebsd.386-x

@@ -24,4 +24,4 @@ LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-header

@@ -32,3 +32,5 @@ LDFLAGS =
 LDELDFLAGS =
 LDEETHERLDFLAGS =
 
+# OSARCHDIR is the os/architecture dir, where executables all go.
+OSARCHDIR = ../$(OSARCHNAME)/

bin/makefile-init-darwin.386

@@ -17,11 +17,12 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 
 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE
+DEBUGFLAGS =
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-darwin.aarch64

@@ -0,0 +1,28 @@
+# Options for MacOS, aarch64 processor, X windows, for INIT processing
+
+CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+        $(OBJECTDIR)xbbt.o \
+        $(OBJECTDIR)dspif.o \
+        $(OBJECTDIR)xinit.o \
+        $(OBJECTDIR)xscroll.o \
+        $(OBJECTDIR)xcursor.o \
+        $(OBJECTDIR)xlspwin.o \
+        $(OBJECTDIR)xrdopt.o \
+        $(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -I/opt/X11/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O0 -g3
+DEBUGFLAGS = # -DDEBUG -DOPTRACE
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/opt/X11/lib -lX11 -lm
+LDELDFLAGS = -L/opt/X11/lib -lX11 -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default : ../$(OSARCHNAME)/ldeinit

bin/makefile-init-sunos5.sparc

@@ -18,24 +18,22 @@
 
 # Options for SPARC under Solaris-2 operating system, X windows.
 
-CC = gcc
+CC = cc -m32 $(DEVSTUDIO_CFLAGS)
 
-XFILES = $(OBJECTDIR)xlspwin.o \
+XFILES = $(OBJECTDIR)xmkicon.o \
-        $(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xinit.o \
 	$(OBJECTDIR)xscroll.o \
 	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xwinman.o \
+	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)kbdif.o \
+	$(OBJECTDIR)xwinman.o
-	$(OBJECTDIR)xinit.o
 
-
+XFLAGS = -DXWINDOW
-XFLAGS = -DXWINDOW -I/usr/openwin/include
 
 # OPTFLAGS is normally -g for MAKEINIT, as it needs debugging often.
-OPTFLAGS = -g3 -O
+OPTFLAGS = -g3 -O0
 
 # Set any debugging options in DEBUGFLAGS.  E.g., to enable stack
 # checking, use -DSTACKCHECK; to enable the fn-call-time stack
@@ -43,9 +41,7 @@ OPTFLAGS = -g3 -O
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DUSE_DLPI \
+MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
-		-I$(OPENWINHOME)/include \
-		-DLOCK_X_UPDATES
 
 # The LDEINIT wants to have NOVERSION set, so we don't hang up on
 # any change-over in versions.
@@ -57,12 +53,12 @@ DFLAGS = -DINIT \
 	 -DNOVERSION -DRELEASE=351 
 
 
-LDFLAGS = -R$(OPENWINHOME)/lib -L$(OPENWINHOME)/lib -lX11 -lc -lm -lsocket -lnsl
+LDFLAGS = -lX11 -lc -lm -lsocket -lnsl
-LDELDFLAGS = -R$(OPENWINHOME)/lib -L$(OPENWINHOME)/lib -lX11  -lc -lm -lsocket -lnsl
+LDELDFLAGS = -lX11  -lc -lm -lsocket -lnsl
 LDEETHERLDFLAGS = -lc -lm -lsocket -lnsl
 
 DLPIFILES = $(OBJECTDIR)dlpi.o
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-linux.386-x

@@ -24,4 +24,4 @@ LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-linux.armv7l-x

@@ -24,4 +24,4 @@ LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-linux.x86_64-x

@@ -25,4 +25,4 @@ LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde 
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-openbsd.x86_64-x

@@ -24,4 +24,4 @@ LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default	: ../$(OSARCHNAME)/lde
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-sunos5.386-x

@@ -47,4 +47,4 @@ DLPIFILES = # $(OBJECTDIR)dlpi.o
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
+default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex

bin/makefile-sunos5.i386-x

@@ -48,4 +48,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
+default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex

bin/makefile-sunos5.sparc-x

@@ -55,4 +55,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
+default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex

bin/makefile-sunos5.x86_64-x

@@ -48,4 +48,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o
 
 OBJECTDIR = ../$(RELEASENAME)/
 
-default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
+default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex

bin/makefile-tail

@@ -33,10 +33,6 @@
 #	3. makeright -e init
 #	4. follow the instructions on {eris}<lispcore>sunloadup>howto-loadup-sunlisp.txt
 
-
-# OSARCHDIR is the os/architecture dir, where executables all go.
-OSARCHDIR = ../$(OSARCHNAME)/
-
 REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h
 
 CFLAGS = $(OPTFLAGS) $(DFLAGS)
@@ -153,9 +149,6 @@ EXTFILES = $(OBJECTDIR)usrsubr.o
 # Development targets - copyprotect is OFF here
 ################################################################################
 
-default: $(OSARCHDIR)lde $(OSARCHDIR)$(LDENAME) $(OSARCHDIR)ldeether \
-	$(OSARCHDIR)tstsout $(OSARCHDIR)setsout
-
 $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o
 	$(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde
 

bin/makeright

@@ -59,7 +59,7 @@ osversion=`osversion`
 echo "making so far for ${osversion} on ${architecture}."
 case "$display" in
 	init)	display=single
-		releasename=init.${architecture}
+		releasename=init-${osversion}.${architecture}
 		ldename=ldeinit
 		;;
 	single)	releasename=${osversion}.${architecture}