Improve process of building ldeinit to allow for different options on different OSs

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 \
-        $(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xrdopt.o \
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
 	$(OBJECTDIR)xscroll.o \
 	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xwinman.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)kbdif.o \
-	$(OBJECTDIR)xinit.o
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
 
-
-XFLAGS = -DXWINDOW -I/usr/openwin/include
+XFLAGS = -DXWINDOW
 
 # 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 \
-		-I$(OPENWINHOME)/include \
-		-DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI -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
-LDELDFLAGS = -R$(OPENWINHOME)/lib -L$(OPENWINHOME)/lib -lX11  -lc -lm -lsocket -lnsl
+LDFLAGS = -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/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}